Make sure the yielded variable is the logger

razum2um · Jun 10, 2016 · 1de3db9 · 1de3db9
1 parent ee7de7d
commit 1de3db9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/activesupport/lib/active_support/logger.rb b/activesupport/lib/active_support/logger.rb
@@ -62,14 +62,14 @@ def self.broadcast(logger) # :nodoc:
               if respond_to?(:silence)
                 super(level, &block)
               else
-                block.call(level)
+                block.call(self)
               end
             end
           else
             if respond_to?(:silence)
               super(level, &block)
             else
-              block.call(level)
+              block.call(self)
             end
           end
         end

diff --git a/activesupport/test/logger_test.rb b/activesupport/test/logger_test.rb
@@ -148,7 +148,8 @@ def test_logger_silencing_works_for_broadcast
     @logger.extend ActiveSupport::Logger.broadcast(another_logger)
 
     @logger.debug "CORRECT DEBUG"
-    @logger.silence do
+    @logger.silence do |logger|
+      assert_kind_of ActiveSupport::Logger, logger
       @logger.debug "FAILURE"
       @logger.error "CORRECT ERROR"
     end
@@ -169,7 +170,8 @@ def test_broadcast_silencing_does_not_break_plain_ruby_logger
     @logger.extend ActiveSupport::Logger.broadcast(another_logger)
 
     @logger.debug "CORRECT DEBUG"
-    @logger.silence do
+    @logger.silence do |logger|
+      assert_kind_of ActiveSupport::Logger, logger
       @logger.debug "FAILURE"
       @logger.error "CORRECT ERROR"
     end