diff options
| author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2019-04-30 16:58:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-30 16:58:30 -0500 |
| commit | 84572fe26785eac8b00ab4db0ba12f23978be3ce (patch) | |
| tree | eafa11e23849f9aef6c59812494a864ab440fdd0 /activesupport/lib/active_support/notifications | |
| parent | 681b0c1f2a2a51becad928ff157d59082ce5c1bd (diff) | |
| parent | b9a9131fdb1a3e8aad7a18741c84f16ac33ddeaf (diff) | |
| download | rails-84572fe26785eac8b00ab4db0ba12f23978be3ce.tar.gz rails-84572fe26785eac8b00ab4db0ba12f23978be3ce.tar.bz2 rails-84572fe26785eac8b00ab4db0ba12f23978be3ce.zip | |
Merge pull request #36148 from ksolo/update-event-duration-in-notifications
Revert changes to monotonic times
Diffstat (limited to 'activesupport/lib/active_support/notifications')
| -rw-r--r-- | activesupport/lib/active_support/notifications/fanout.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/notifications/fanout.rb b/activesupport/lib/active_support/notifications/fanout.rb index 8812b67f63..c506b35b1e 100644 --- a/activesupport/lib/active_support/notifications/fanout.rb +++ b/activesupport/lib/active_support/notifications/fanout.rb @@ -180,13 +180,13 @@ module ActiveSupport def start(name, id, payload) timestack = Thread.current[:_timestack] ||= [] - timestack.push Concurrent.monotonic_time + timestack.push Time.now end def finish(name, id, payload) timestack = Thread.current[:_timestack] started = timestack.pop - @delegate.call(name, started, Concurrent.monotonic_time, id, payload) + @delegate.call(name, started, Time.now, id, payload) end end |