diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2017-08-09 10:40:45 +0000 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2017-08-09 10:40:45 +0000 |
| commit | e358cf251a1916284033c4af6f9c75495ad1e2a7 (patch) | |
| tree | c05ddec11cf9a49f3f3152b02ced9365b145d782 /lib/gitlab_metrics.rb | |
| parent | 1e587d3b7fbe596ab010cb022b0c6526d2489613 (diff) | |
| parent | 8d46316067399dc8cfe47d705faeb7e323bbad59 (diff) | |
| download | gitlab-shell-e358cf251a1916284033c4af6f9c75495ad1e2a7.tar.gz | |
Merge branch '69-monotonic-clock' into 'master'
Support old versions of ruby without a monotonic clock
Closes #69
See merge request !161
Diffstat (limited to 'lib/gitlab_metrics.rb')
| -rw-r--r-- | lib/gitlab_metrics.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/gitlab_metrics.rb b/lib/gitlab_metrics.rb index b974b8a..413b799 100644 --- a/lib/gitlab_metrics.rb +++ b/lib/gitlab_metrics.rb @@ -21,7 +21,11 @@ module GitlabMetrics # # Returns the time as a Fixnum. def self.monotonic_time - Process.clock_gettime(Process::CLOCK_MONOTONIC, :millisecond) + if defined?(Process::CLOCK_MONOTONIC) + Process.clock_gettime(Process::CLOCK_MONOTONIC, :millisecond) + else + Process.clock_gettime(Process::CLOCK_REALTIME, :millisecond) + end end end |