aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib
diff options
context:
space:
mode:
authorタコ焼き仮面 <takoyakikamen0@gmail.com>2012-06-19 20:44:45 -0700
committerタコ焼き仮面 <takoyakikamen0@gmail.com>2012-06-19 20:44:45 -0700
commit84403ae065a213f40ccce397c7b428ad8b79ec00 (patch)
treee4501cfd29983cf81bc0d9792147168262636bdc /activesupport/lib
parent39dec69712aaf954c0f00f2a32c32356d789e3ed (diff)
downloadrails-84403ae065a213f40ccce397c7b428ad8b79ec00.tar.gz
rails-84403ae065a213f40ccce397c7b428ad8b79ec00.tar.bz2
rails-84403ae065a213f40ccce397c7b428ad8b79ec00.zip
Correct the AP test。
Diffstat (limited to 'activesupport/lib')
-rw-r--r--activesupport/lib/active_support/log_subscriber.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/log_subscriber.rb b/activesupport/lib/active_support/log_subscriber.rb
index 720954625a..8c3921c423 100644
--- a/activesupport/lib/active_support/log_subscriber.rb
+++ b/activesupport/lib/active_support/log_subscriber.rb
@@ -111,6 +111,7 @@ module ActiveSupport
finished = Time.now
event = @event_stack.pop
event.end = finished
+ event.payload.merge!(payload)
method = name.split('.').first
begin