diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
commit | 311b0269b4eb9839fa63f80c8d7a58f32b8138a0 (patch) | |
tree | 07e7870bca8aed6d61fdcc810731c50d2c40af47 /lib/gitlab/prometheus_client.rb | |
parent | 27909cef6c4170ed9205afa7426b8d3de47cbb0c (diff) |
Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42
Diffstat (limited to 'lib/gitlab/prometheus_client.rb')
-rw-r--r-- | lib/gitlab/prometheus_client.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/gitlab/prometheus_client.rb b/lib/gitlab/prometheus_client.rb index 8182dbad4f8..dda28ffdf90 100644 --- a/lib/gitlab/prometheus_client.rb +++ b/lib/gitlab/prometheus_client.rb @@ -151,12 +151,8 @@ module Gitlab def get(path, args) Gitlab::HTTP.get(path, { query: args }.merge(http_options) ) - rescue SocketError - raise PrometheusClient::ConnectionError, "Can't connect to #{api_url}" - rescue OpenSSL::SSL::SSLError - raise PrometheusClient::ConnectionError, "#{api_url} contains invalid SSL data" - rescue Errno::ECONNREFUSED - raise PrometheusClient::ConnectionError, 'Connection refused' + rescue *Gitlab::HTTP::HTTP_ERRORS => e + raise PrometheusClient::ConnectionError, e.message end def handle_management_api_response(response) |