degrade nicefully when a server is unreachable

ranman · Jul 2, 2012 · 0365511 · 0365511
1 parent 541a812
commit 0365511
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/lib/stoplight/providers/jenkins.rb b/lib/stoplight/providers/jenkins.rb
@@ -11,7 +11,7 @@ def provider
     end
 
     def projects
-      if @response.parsed_response.nil? || @response.parsed_response['Projects'].nil?
+      if @response.nil? || @response.parsed_response.nil? || @response.parsed_response['Projects'].nil?
         @projects ||= []
       else
         @projects ||= @response.parsed_response['Projects']['Project'].collect do |project|

diff --git a/lib/stoplight/providers/multi_project_standard.rb b/lib/stoplight/providers/multi_project_standard.rb
@@ -19,7 +19,7 @@ def builds_path
     end
 
     def projects
-      if @response.parsed_response.nil? || @response.parsed_response['Projects'].nil?
+      if @response.nil? || @response.parsed_response.nil? || @response.parsed_response['Projects'].nil?
         @projects ||= []
       else
         @projects ||= @response.parsed_response['Projects']['Project'].collect do |project|

diff --git a/lib/stoplight/providers/provider.rb b/lib/stoplight/providers/provider.rb
@@ -77,8 +77,8 @@ def load_server_data(options = {})
       http_method = options[:method] || 'get'
       return HTTParty.send(http_method.downcase.to_sym, url, url_options)
     rescue Exception => e
-      $logger.error "#{e.to_s}: Could not connect to `#{url}`"
-      return false
+      $logger.error "#{e.to_s}: `#{url}`"
+      nil
     end
   end
 end
diff --git a/lib/stoplight/providers/travis.rb b/lib/stoplight/providers/travis.rb
@@ -16,7 +16,7 @@ def builds_path
     end
 
     def projects
-      if @response.parsed_response.nil?
+      if @response.nil? || @response.parsed_response.nil?
         @projects ||= []
       else
         @projects ||= @response.parsed_response.collect do |project|