diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-18 14:56:05 -0800 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-02-18 14:56:05 -0800 |
commit | 8ab4228b08c6f3bada042e7fd74ae1e2583e8191 (patch) | |
tree | efbe726e17cce31961185ae83c5c1ebb82527bec /lib/gitlab_net.rb | |
parent | b0979371b87d86cec1f35b6ac7f1242b917ab4d4 (diff) | |
download | gitlab-shell-8ab4228b08c6f3bada042e7fd74ae1e2583e8191.tar.gz |
Improve broadcast message logicv2.5.1
Expect broadcast message API endpoint to return 200 with empty JSON if
no broadcast messages available
Diffstat (limited to 'lib/gitlab_net.rb')
-rw-r--r-- | lib/gitlab_net.rb | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/gitlab_net.rb b/lib/gitlab_net.rb index e74c97f..d5bda88 100644 --- a/lib/gitlab_net.rb +++ b/lib/gitlab_net.rb @@ -45,11 +45,7 @@ class GitlabNet def broadcast_message resp = get("#{host}/broadcast_message") - if resp.code == '200' - JSON.parse(resp.body) rescue nil - else - nil - end + JSON.parse(resp.body) rescue {} end def check @@ -95,7 +91,7 @@ class GitlabNet $logger.debug "Performing #{method.to_s.upcase} #{url}" uri = URI.parse(url) - + http = http_client_for(uri) request = http_request_for(method, uri, params) @@ -103,7 +99,7 @@ class GitlabNet response = http.start { http.request(request) } rescue => e $logger.warn "Failed to connect to internal API <#{method.to_s.upcase} #{url}>: #{e.inspect}" - raise ApiUnreachableError + raise ApiUnreachableError end if response.code == "200" |