From 03655113c0d82886002c70296055f8e45bf38cd4 Mon Sep 17 00:00:00 2001 From: Seth Vargo Date: Mon, 2 Jul 2012 10:40:39 -0400 Subject: [PATCH] degrade nicefully when a server is unreachable --- lib/stoplight/providers/jenkins.rb | 2 +- lib/stoplight/providers/multi_project_standard.rb | 2 +- lib/stoplight/providers/provider.rb | 4 ++-- lib/stoplight/providers/travis.rb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/stoplight/providers/jenkins.rb b/lib/stoplight/providers/jenkins.rb index b9b773a..a4d97ec 100644 --- 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 index 06b3b42..a50506f 100644 --- 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 index f8c729f..05fb24f 100644 --- 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 index fd1a1fa..a261e07 100644 --- 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|