summaryrefslogtreecommitdiff
path: root/lib/chef/monkey_patches
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2018-12-07 11:15:23 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2019-01-03 10:53:48 -0800
commit10db9b3a50eae9c4c966f39f5beca8f5c17d441e (patch)
tree596bb3da0bcd1e2fe9a24e3a376fd6223cb6156f /lib/chef/monkey_patches
parent94ba9c022e57feb2949e22656d811a843b3410f1 (diff)
downloadchef-10db9b3a50eae9c4c966f39f5beca8f5c17d441e.tar.gz
change HTTPServerException to HTTPClientException for ruby 2.6
includes backcompat for 2.5 Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
Diffstat (limited to 'lib/chef/monkey_patches')
-rw-r--r--lib/chef/monkey_patches/net_http.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/chef/monkey_patches/net_http.rb b/lib/chef/monkey_patches/net_http.rb
index 15ccf0fff5..775568639b 100644
--- a/lib/chef/monkey_patches/net_http.rb
+++ b/lib/chef/monkey_patches/net_http.rb
@@ -5,6 +5,10 @@ module ChefNetHTTPExceptionExtensions
attr_accessor :chef_rest_request
end
+unless defined?(Net::HTTPClientException)
+ Net::HTTPClientException = Net::HTTPServerException
+end
+
require "net/http"
module Net
class HTTPError
@@ -13,7 +17,7 @@ module Net
class HTTPRetriableError
include ChefNetHTTPExceptionExtensions
end
- class HTTPServerException
+ class HTTPClientException
include ChefNetHTTPExceptionExtensions
end
class HTTPFatalError