diff options
| author | Ash McKenzie <amckenzie@gitlab.com> | 2019-08-07 02:42:21 +0000 |
|---|---|---|
| committer | Ash McKenzie <amckenzie@gitlab.com> | 2019-08-07 02:42:21 +0000 |
| commit | 4bbf94201085defb9bcbca3d577c2752f4e3b35b (patch) | |
| tree | c7ee78a5f64224569be50ae2534e10ce566fe6df /lib/sentry/client.rb | |
| parent | b67ed9c96720864b9ddae973b34f7456c9321789 (diff) | |
| parent | 467a411e8892ecd6a3be7cd2f6772665f2c63651 (diff) | |
| download | gitlab-ce-4bbf94201085defb9bcbca3d577c2752f4e3b35b.tar.gz | |
Merge branch '60024-remove-restclient-from-prom-client' into 'master'
Resolve "Use Gitlab::HTTP in PrometheusClient instead of RestClient"
Closes #60024
See merge request gitlab-org/gitlab-ce!31053
Diffstat (limited to 'lib/sentry/client.rb')
| -rw-r--r-- | lib/sentry/client.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sentry/client.rb b/lib/sentry/client.rb index 4022e8ff946..07cca1c8d1e 100644 --- a/lib/sentry/client.rb +++ b/lib/sentry/client.rb @@ -67,7 +67,7 @@ module Sentry def handle_request_exceptions yield - rescue HTTParty::Error => e + rescue Gitlab::HTTP::Error => e Gitlab::Sentry.track_acceptable_exception(e) raise_error 'Error when connecting to Sentry' rescue Net::OpenTimeout |