aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorVishal Telangre <the@vishaltelangre.com>2019-04-16 03:26:16 +0530
committerVishal Telangre <the@vishaltelangre.com>2019-04-16 03:26:16 +0530
commitcb9c86bc8316a9b63599b989df6db6becb4fcb3b (patch)
tree820905e4d7a7c9bdead0e57a0942fd3e636f5b1a /activesupport
parent81c8f18d849a1538c4b838187280a572a5ff15e8 (diff)
downloadrails-cb9c86bc8316a9b63599b989df6db6becb4fcb3b.tar.gz
rails-cb9c86bc8316a9b63599b989df6db6becb4fcb3b.tar.bz2
rails-cb9c86bc8316a9b63599b989df6db6becb4fcb3b.zip
Fix: #cpu_time doesn't work for a `ActiveSupport::Notifications::Fanout::Subscribers::Timed` subscriber
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/notifications/instrumenter.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/notifications/instrumenter.rb b/activesupport/lib/active_support/notifications/instrumenter.rb
index a03e7e483e..1940b33799 100644
--- a/activesupport/lib/active_support/notifications/instrumenter.rb
+++ b/activesupport/lib/active_support/notifications/instrumenter.rb
@@ -69,8 +69,8 @@ module ActiveSupport
@end = ending
@children = []
@duration = nil
- @cpu_time_start = nil
- @cpu_time_finish = nil
+ @cpu_time_start = 0
+ @cpu_time_finish = 0
@allocation_count_start = 0
@allocation_count_finish = 0
end