summaryrefslogtreecommitdiff
path: root/lib/gitlab/usage_data
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-04-26 12:09:44 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-04-26 12:09:44 +0000
commite5e0589e097991ca671a348de81331240e85719d (patch)
tree0767e6d3388f6ebf65f5d47a3ecb0d52430fa7da /lib/gitlab/usage_data
parent0ccabeb3f62c5fbc81f52cc16fa654404bb87874 (diff)
downloadgitlab-ce-e5e0589e097991ca671a348de81331240e85719d.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/usage_data')
-rw-r--r--lib/gitlab/usage_data/topology.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/usage_data/topology.rb b/lib/gitlab/usage_data/topology.rb
index 7f7854c3eb1..b823d6cc2bf 100644
--- a/lib/gitlab/usage_data/topology.rb
+++ b/lib/gitlab/usage_data/topology.rb
@@ -47,7 +47,7 @@ module Gitlab
nodes: topology_node_data(client)
}.compact
end
- rescue => e
+ rescue StandardError => e
@failures << CollectionFailure.new('other', e.class.to_s)
{}
@@ -183,7 +183,7 @@ module Gitlab
@failures << CollectionFailure.new(query_name, 'empty_result')
fallback
- rescue => e
+ rescue StandardError => e
@failures << CollectionFailure.new(query_name, e.class.to_s)
fallback
end