diff options
author | Ramachandra Joshi <rgjoshi24@gmail.com> | 2021-08-27 15:44:46 +0000 |
---|---|---|
committer | Tim Smith <tsmith84@gmail.com> | 2021-09-16 18:24:34 -0700 |
commit | c12f789b5c835d9ef411984a405d2ad5096b07a3 (patch) | |
tree | 3ad1ddabdf4cab7d2641abb27712853c3032beed | |
parent | 874dfa1f84a38d4df41bbcbbfd6b3e3305ed51a4 (diff) | |
download | chef-c12f789b5c835d9ef411984a405d2ad5096b07a3.tar.gz |
Downgrade http retry log level to warning
Because we are retrying, it is not an error. If we fail the retries we raise an exception, which will log at the error or fatal level.
See also [INFRA-I-25](https://chef-software.ideas.aha.io/ideas/INFRA-I-25)
-rw-r--r-- | lib/chef/http.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/chef/http.rb b/lib/chef/http.rb index 162998b7f3..00e1d2bd50 100644 --- a/lib/chef/http.rb +++ b/lib/chef/http.rb @@ -423,7 +423,7 @@ class Chef if response.is_a?(Net::HTTPServerError) && !Chef::Config.local_mode 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") + Chef::Log.warn("Server returned error #{response.code} for #{url}, retrying #{http_attempts}/#{http_retry_count} in #{sleep_time}s") # Updated from error to warn sleep(sleep_time) redo end @@ -432,7 +432,7 @@ class Chef end rescue SocketError, Errno::ETIMEDOUT, Errno::ECONNRESET => e if http_retry_count - http_attempts >= 0 - Chef::Log.error("Error connecting to #{url}, retry #{http_attempts}/#{http_retry_count}") + Chef::Log.warn("Error connecting to #{url}, retry #{http_attempts}/#{http_retry_count}") # Updated from error to warn sleep(http_retry_delay) retry end @@ -440,21 +440,21 @@ class Chef raise e rescue Errno::ECONNREFUSED if http_retry_count - http_attempts >= 0 - Chef::Log.error("Connection refused connecting to #{url}, retry #{http_attempts}/#{http_retry_count}") + Chef::Log.warn("Connection refused connecting to #{url}, retry #{http_attempts}/#{http_retry_count}") # Updated from error to warn 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 >= 0 - Chef::Log.error("Timeout connecting to #{url}, retry #{http_attempts}/#{http_retry_count}") + Chef::Log.warn("Timeout connecting to #{url}, retry #{http_attempts}/#{http_retry_count}") # Updated from error to warn 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 >= 0) && !e.message.include?("certificate verify failed") - Chef::Log.error("SSL Error connecting to #{url}, retry #{http_attempts}/#{http_retry_count}") + Chef::Log.warn("SSL Error connecting to #{url}, retry #{http_attempts}/#{http_retry_count}") # Updated from error to warn sleep(http_retry_delay) retry end |