diff options
| author | Kevin Solorio <soloriok@gmail.com> | 2019-04-30 14:32:03 -0700 |
|---|---|---|
| committer | Kevin Solorio <soloriok@gmail.com> | 2019-04-30 14:32:03 -0700 |
| commit | b9a9131fdb1a3e8aad7a18741c84f16ac33ddeaf (patch) | |
| tree | eafa11e23849f9aef6c59812494a864ab440fdd0 /activesupport/lib | |
| parent | 681b0c1f2a2a51becad928ff157d59082ce5c1bd (diff) | |
| download | rails-b9a9131fdb1a3e8aad7a18741c84f16ac33ddeaf.tar.gz rails-b9a9131fdb1a3e8aad7a18741c84f16ac33ddeaf.tar.bz2 rails-b9a9131fdb1a3e8aad7a18741c84f16ac33ddeaf.zip | |
revert changes to monotonic times
The change to monotonic times causes failures for applications
where the subscribed block is expecting Time objects as described
in this issue: https://github.com/rails/rails/issues/36145
The original PR (https://github.com/rails/rails/pull/35984) was
concerned with errors on the cpu_time. Test was edited to reflect
changes to initializer using 0 values instead of nil
Diffstat (limited to 'activesupport/lib')
| -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 |