summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-09-26 15:06:18 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-09-26 15:06:18 +0000
commit4e9f718e190a944c39fda2a178eb8b901e7e6ec7 (patch)
treefcdcdf846450ebad15da60375ab3805ff9b343e8 /lib
parent5707f305f4b961e24369fcdaecf0b8ce1c34bad8 (diff)
downloadgitlab-ce-4e9f718e190a944c39fda2a178eb8b901e7e6ec7.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/health_checks/simple_abstract_check.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/gitlab/health_checks/simple_abstract_check.rb b/lib/gitlab/health_checks/simple_abstract_check.rb
index 5a1e8c2a1dd..bc02f0da98d 100644
--- a/lib/gitlab/health_checks/simple_abstract_check.rb
+++ b/lib/gitlab/health_checks/simple_abstract_check.rb
@@ -14,6 +14,8 @@ module Gitlab
else
HealthChecks::Result.new(false, "unexpected #{human_name} check result: #{check_result}")
end
+ rescue => e
+ HealthChecks::Result.new(false, "unexpected #{human_name} check result: #{e}")
end
def metrics