From e12901e4235d1ece2a17c5419f4420f1931cc6a4 Mon Sep 17 00:00:00 2001 From: wangjohn Date: Tue, 9 Apr 2013 19:20:49 -0400 Subject: Changed the ScopeRegistry and the InstrumentationRegistry to use the PerThreadRegistry module. --- activesupport/lib/active_support/notifications.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'activesupport') diff --git a/activesupport/lib/active_support/notifications.rb b/activesupport/lib/active_support/notifications.rb index ab2bb5fafe..5c985601f4 100644 --- a/activesupport/lib/active_support/notifications.rb +++ b/activesupport/lib/active_support/notifications.rb @@ -1,5 +1,6 @@ require 'active_support/notifications/instrumenter' require 'active_support/notifications/fanout' +require 'active_support/per_thread_registry' module ActiveSupport # = Notifications @@ -190,12 +191,10 @@ module ActiveSupport # The instrumenters for multiple notifiers are held in a single instance of # this class. class InstrumentationRegistry # :nodoc: - class << self - delegate :instrumenter_for, to: :current + extend ActiveSupport::PerThreadRegistry - def current - Thread.current[:instrumentation_registry] ||= new - end + class << self + delegate :instrumenter_for, to: :instance end def initialize -- cgit v1.2.3