1 files changed, 4 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/tagged_logging.rb b/activesupport/lib/active_support/tagged_logging.rb
index f6ad861353..5e080df518 100644
--- a/activesupport/lib/active_support/tagged_logging.rb
+++ b/activesupport/lib/active_support/tagged_logging.rb
@@ -3,7 +3,7 @@ require 'logger'
 require 'active_support/logger'
 
 module ActiveSupport
-  # Wraps any standard Logger object to provide tagging capabilities. Examples:
+  # Wraps any standard Logger object to provide tagging capabilities.
   #
   #   logger = ActiveSupport::TaggedLogging.new(Logger.new(STDOUT))
   #   logger.tagged("BCX") { logger.info "Stuff" }                            # Logs "[BCX] Stuff"
@@ -13,7 +13,7 @@ module ActiveSupport
   # This is used by the default Rails.logger as configured by Railties to make it easy to stamp log lines
   # with subdomains, request ids, and anything else to aid debugging of multi-user production applications.
   module TaggedLogging
-    class Formatter < ActiveSupport::Logger::SimpleFormatter # :nodoc:
+    module Formatter # :nodoc:
       # This method is invoked when a log event occurs
       def call(severity, timestamp, progname, msg)
         super(severity, timestamp, progname, "#{tags_text}#{msg}")
@@ -37,7 +37,7 @@ module ActiveSupport
     end
 
     def self.new(logger)
-      logger.formatter = Formatter.new
+      logger.formatter.extend Formatter
       logger.extend(self)
     end
 
@@ -45,7 +45,7 @@ module ActiveSupport
       tags     = formatter.current_tags
       new_tags = new_tags.flatten.reject(&:blank?)
       tags.concat new_tags
-      yield
+      yield self
     ensure
       tags.pop(new_tags.size)
     end