diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-23 18:08:46 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-23 18:08:46 +0300 |
| commit | 3f9e1b261121f4dbd045341241f81b47356c99cf (patch) | |
| tree | 32be23bd7fda0c3f891182f220f6d0399a1b41dd /lib/gitlab/health_checks | |
| parent | 5ad0cf26551baff8f08af8562a8d45e6ec14d71a (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/health_checks')
| -rw-r--r-- | lib/gitlab/health_checks/base_abstract_check.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/gitlab/health_checks/base_abstract_check.rb b/lib/gitlab/health_checks/base_abstract_check.rb index 199cd2f9b2d..7e1c5331b07 100644 --- a/lib/gitlab/health_checks/base_abstract_check.rb +++ b/lib/gitlab/health_checks/base_abstract_check.rb @@ -32,11 +32,9 @@ module Gitlab end def catch_timeout(seconds, &block) - begin - Timeout.timeout(seconds.to_i, &block) - rescue Timeout::Error => ex - ex - end + Timeout.timeout(seconds.to_i, &block) + rescue Timeout::Error => ex + ex end end end |