summaryrefslogtreecommitdiff
path: root/lib/gitlab_metrics.rb
diff options
context:
space:
mode:
authorMarin Jankovski <marin@gitlab.com>2016-10-12 14:22:26 +0000
committerMarin Jankovski <marin@gitlab.com>2016-10-12 14:22:26 +0000
commit8ba3bc0e3014125d519af26ee601df0d25bfefc5 (patch)
treee40a001e12b025cf5934e9393c4baa17a35e9990 /lib/gitlab_metrics.rb
parent3cba0e6ea6d30e9faca7727b66eb9ddfe5b5b51c (diff)
parent1d68fefe5016baa61043e72ba7ee5458eded8634 (diff)
downloadgitlab-shell-8ba3bc0e3014125d519af26ee601df0d25bfefc5.tar.gz
Merge branch 'reuse-logger' into 'master'
Re-use the default logger for performance metrics See #64 for the discussion leading up to this. See merge request !100
Diffstat (limited to 'lib/gitlab_metrics.rb')
-rw-r--r--lib/gitlab_metrics.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/gitlab_metrics.rb b/lib/gitlab_metrics.rb
index 7bf07a5..b974b8a 100644
--- a/lib/gitlab_metrics.rb
+++ b/lib/gitlab_metrics.rb
@@ -1,5 +1,6 @@
require 'logger'
require_relative 'gitlab_config'
+require_relative 'gitlab_logger'
module GitlabMetrics
module System
@@ -25,7 +26,7 @@ module GitlabMetrics
end
def self.logger
- @logger ||= Logger.new(GitlabConfig.new.metrics_log_file)
+ $logger
end
# Measures the execution time of a block.
@@ -48,7 +49,7 @@ module GitlabMetrics
real_time = System.monotonic_time - start_real
cpu_time = System.cpu_time - start_cpu
- logger.debug { "name=#{name.inspect} wall_time=#{real_time.inspect} cpu_time=#{cpu_time.inspect}" }
+ logger.debug("metrics: name=#{name.inspect} wall_time=#{real_time} cpu_time=#{cpu_time}")
retval
end