make the fanout notifier local to the current thread

1 files changed, 8 insertions, 4 deletions

diff --git a/activesupport/lib/active_support/notifications.rb b/activesupport/lib/active_support/notifications.rb
index e3d8cf48ce..2e2314cad5 100644
--- a/activesupport/lib/active_support/notifications.rb
+++ b/activesupport/lib/active_support/notifications.rb
@@ -138,8 +138,6 @@ module ActiveSupport
     @instrumenters = Hash.new { |h,k| h[k] = notifier.listening?(k) }
 
     class << self
-      attr_accessor :notifier
-
       def publish(name, *args)
         notifier.publish(name, *args)
       end
@@ -173,8 +171,14 @@ module ActiveSupport
       def instrumenter
         Thread.current[:"instrumentation_#{notifier.object_id}"] ||= Instrumenter.new(notifier)
       end
-    end
 
-    self.notifier = Fanout.new
+      def notifier
+        Thread.current[:notifier] ||= Fanout.new
+      end
+
+      def notifier=(notifier)
+        Thread.current[:notifier] = notifier
+      end
+    end
   end
 end