From c6af7646ad6975b46daee7e800a90fbd88431d6b Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Tue, 19 Jun 2012 11:01:33 -0700 Subject: [PATCH] listeners are per thread, so remove nested hash --- activesupport/lib/active_support/log_subscriber.rb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/activesupport/lib/active_support/log_subscriber.rb b/activesupport/lib/active_support/log_subscriber.rb index 2e423b0364..3023e0d274 100644 --- a/activesupport/lib/active_support/log_subscriber.rb +++ b/activesupport/lib/active_support/log_subscriber.rb @@ -87,9 +87,7 @@ def flush_all! end def initialize - @event_stack = Hash.new { |h,id| - h[id] = Hash.new { |ids,name| ids[name] = [] } - } + @event_stack = [] super end @@ -97,17 +95,17 @@ def start(name, id, payload) return unless logger e = ActiveSupport::Notifications::Event.new(name, Time.now, nil, id, payload) - parent = @event_stack[id][name].last + parent = @event_stack.last parent << e if parent - @event_stack[id][name].push e + @event_stack.push e end def finish(name, id, payload) return unless logger finished = Time.now - event = @event_stack[id][name].pop + event = @event_stack.pop event.end = finished method = name.split('.').first -- GitLab