diff options
| author | Rafael França <rafael@franca.dev> | 2019-07-25 16:47:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-25 16:47:03 -0400 |
| commit | bd5edc29709116104345cf09c17f1db89428753e (patch) | |
| tree | 63c8ba5a61b4f9a1a57435b3cd4aaeb92707a86b /activesupport/lib | |
| parent | c9b7b9ff8adb3f01db0f9af90359030028a33b5b (diff) | |
| parent | 218f0777d6abf1b2f933e44bd08f75f3d28c75ca (diff) | |
| download | rails-bd5edc29709116104345cf09c17f1db89428753e.tar.gz rails-bd5edc29709116104345cf09c17f1db89428753e.tar.bz2 rails-bd5edc29709116104345cf09c17f1db89428753e.zip | |
Merge pull request #36318 from itsWill/fix_event_object_payload
Merge payload for EventObject subscribers
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/notifications/fanout.rb | 1 | ||||
| -rw-r--r-- | activesupport/lib/active_support/notifications/instrumenter.rb | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/notifications/fanout.rb b/activesupport/lib/active_support/notifications/fanout.rb index aa602329ec..dda71b880e 100644 --- a/activesupport/lib/active_support/notifications/fanout.rb +++ b/activesupport/lib/active_support/notifications/fanout.rb @@ -218,6 +218,7 @@ module ActiveSupport def finish(name, id, payload) stack = Thread.current[:_event_stack] event = stack.pop + event.payload = payload event.finish! @delegate.call event end diff --git a/activesupport/lib/active_support/notifications/instrumenter.rb b/activesupport/lib/active_support/notifications/instrumenter.rb index 7ab39c9bfb..24e1ab313a 100644 --- a/activesupport/lib/active_support/notifications/instrumenter.rb +++ b/activesupport/lib/active_support/notifications/instrumenter.rb @@ -52,7 +52,8 @@ module ActiveSupport end class Event - attr_reader :name, :time, :end, :transaction_id, :payload, :children + attr_reader :name, :time, :end, :transaction_id, :children + attr_accessor :payload def self.clock_gettime_supported? # :nodoc: defined?(Process::CLOCK_PROCESS_CPUTIME_ID) && |