diff options
author | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-07-25 15:17:05 +0200 |
---|---|---|
committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2017-07-25 15:17:05 +0200 |
commit | 37f27079fe16ffb6f8dbb888593335a361f5964a (patch) | |
tree | 10868eacbb759df44a12c68b491794a31f4974eb | |
parent | b1d6670d049c9645ddf4def369de0b12521692b5 (diff) | |
download | gitlab-ce-37f27079fe16ffb6f8dbb888593335a361f5964a.tar.gz |
Fix redis check with_timing method usage
-rw-r--r-- | lib/gitlab/health_checks/simple_abstract_check.rb | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/lib/gitlab/health_checks/simple_abstract_check.rb b/lib/gitlab/health_checks/simple_abstract_check.rb index 3dcb28a193c..f5026171ba4 100644 --- a/lib/gitlab/health_checks/simple_abstract_check.rb +++ b/lib/gitlab/health_checks/simple_abstract_check.rb @@ -15,14 +15,13 @@ module Gitlab end def metrics - with_timing method(:check) do |result, elapsed| - Rails.logger.error("#{human_name} check returned unexpected result #{result}") unless is_successful?(result) - [ - metric("#{metric_prefix}_timeout", result.is_a?(Timeout::Error) ? 1 : 0), - metric("#{metric_prefix}_success", is_successful?(result) ? 1 : 0), - metric("#{metric_prefix}_latency_seconds", elapsed) - ] - end + result, elapsed = with_timing(&method(:check)) + Rails.logger.error("#{human_name} check returned unexpected result #{result}") unless is_successful?(result) + [ + metric("#{metric_prefix}_timeout", result.is_a?(Timeout::Error) ? 1 : 0), + metric("#{metric_prefix}_success", is_successful?(result) ? 1 : 0), + metric("#{metric_prefix}_latency_seconds", elapsed) + ] end private |