diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2019-02-08 16:54:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-08 16:54:13 +0100 |
| commit | 216b8aa40f694fddb51c22f5dfc150f6ca578598 (patch) | |
| tree | b9b714e56732227447b039b16d1bea04cb73424e /activesupport/lib/active_support/notifications/instrumenter.rb | |
| parent | 8cae8dcf5473a53179933eee1f0a36db436bbf1e (diff) | |
| parent | dda9452314bb904a3e2c850bd23f118eb80e3356 (diff) | |
| download | rails-216b8aa40f694fddb51c22f5dfc150f6ca578598.tar.gz rails-216b8aa40f694fddb51c22f5dfc150f6ca578598.tar.bz2 rails-216b8aa40f694fddb51c22f5dfc150f6ca578598.zip | |
Merge pull request #34618 from bogdanvlviv/fix-elapsed-time-calculations
Fix elapsed time calculations
Diffstat (limited to 'activesupport/lib/active_support/notifications/instrumenter.rb')
| -rw-r--r-- | activesupport/lib/active_support/notifications/instrumenter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/notifications/instrumenter.rb b/activesupport/lib/active_support/notifications/instrumenter.rb index 125c06f37a..00a57c38c9 100644 --- a/activesupport/lib/active_support/notifications/instrumenter.rb +++ b/activesupport/lib/active_support/notifications/instrumenter.rb @@ -137,7 +137,7 @@ module ActiveSupport private def now - Process.clock_gettime(Process::CLOCK_MONOTONIC) + Concurrent.monotonic_time end if clock_gettime_supported? |