diff options
Diffstat (limited to 'lib/chef/http.rb')
| -rw-r--r-- | lib/chef/http.rb | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/lib/chef/http.rb b/lib/chef/http.rb index eed2a41815..bf5361d4b5 100644 --- a/lib/chef/http.rb +++ b/lib/chef/http.rb @@ -154,7 +154,7 @@ class Chef rescue Net::HTTPClientException => e http_attempts += 1 response = e.response - if response.is_a?(Net::HTTPNotAcceptable) && version_retries - http_attempts > 0 + if response.is_a?(Net::HTTPNotAcceptable) && version_retries - http_attempts >= 0 Chef::Log.trace("Negotiating protocol version with #{url}, retry #{http_attempts}/#{version_retries}") retry else @@ -193,7 +193,7 @@ class Chef rescue Net::HTTPClientException => e http_attempts += 1 response = e.response - if response.is_a?(Net::HTTPNotAcceptable) && version_retries - http_attempts > 0 + if response.is_a?(Net::HTTPNotAcceptable) && version_retries - http_attempts >= 0 Chef::Log.trace("Negotiating protocol version with #{url}, retry #{http_attempts}/#{version_retries}") retry else @@ -249,7 +249,7 @@ class Chef rescue Net::HTTPClientException => e http_attempts += 1 response = e.response - if response.is_a?(Net::HTTPNotAcceptable) && version_retries - http_attempts > 0 + if response.is_a?(Net::HTTPNotAcceptable) && version_retries - http_attempts >= 0 Chef::Log.trace("Negotiating protocol version with #{url}, retry #{http_attempts}/#{version_retries}") retry else @@ -428,7 +428,7 @@ class Chef response, request, return_value = yield # handle HTTP 50X Error if response.is_a?(Net::HTTPServerError) && !Chef::Config.local_mode - if http_retry_count - http_attempts + 1 > 0 + if http_retry_count - http_attempts >= 0 sleep_time = 1 + (2**http_attempts) + rand(2**http_attempts) Chef::Log.error("Server returned error #{response.code} for #{url}, retrying #{http_attempts}/#{http_retry_count} in #{sleep_time}s") sleep(sleep_time) @@ -438,7 +438,7 @@ class Chef return [response, request, return_value] end rescue SocketError, Errno::ETIMEDOUT, Errno::ECONNRESET => e - if http_retry_count - http_attempts + 1 > 0 + if http_retry_count - http_attempts >= 0 Chef::Log.error("Error connecting to #{url}, retry #{http_attempts}/#{http_retry_count}") sleep(http_retry_delay) retry @@ -446,21 +446,21 @@ class Chef e.message.replace "Error connecting to #{url} - #{e.message}" raise e rescue Errno::ECONNREFUSED - if http_retry_count - http_attempts + 1 > 0 + if http_retry_count - http_attempts >= 0 Chef::Log.error("Connection refused connecting to #{url}, retry #{http_attempts}/#{http_retry_count}") sleep(http_retry_delay) retry end raise Errno::ECONNREFUSED, "Connection refused connecting to #{url}, giving up" rescue Timeout::Error - if http_retry_count - http_attempts + 1 > 0 + if http_retry_count - http_attempts >= 0 Chef::Log.error("Timeout connecting to #{url}, retry #{http_attempts}/#{http_retry_count}") sleep(http_retry_delay) retry end raise Timeout::Error, "Timeout connecting to #{url}, giving up" rescue OpenSSL::SSL::SSLError => e - if (http_retry_count - http_attempts + 1 > 0) && !e.message.include?("certificate verify failed") + if (http_retry_count - http_attempts >= 0) && !e.message.include?("certificate verify failed") Chef::Log.error("SSL Error connecting to #{url}, retry #{http_attempts}/#{http_retry_count}") sleep(http_retry_delay) retry @@ -470,11 +470,7 @@ class Chef end def version_retries - @version_retries ||= if options[:version_class] - options[:version_class].possible_requests - else - 0 - end + @version_retries ||= options[:version_class]&.possible_requests || 1 end # @api private |