Make sure the yielded variable is the logger

上级 ee7de7d9
...@@ -62,14 +62,14 @@ def self.broadcast(logger) # :nodoc: ...@@ -62,14 +62,14 @@ def self.broadcast(logger) # :nodoc:
if respond_to?(:silence) if respond_to?(:silence)
super(level, &block) super(level, &block)
else else
block.call(level) block.call(self)
end end
end end
else else
if respond_to?(:silence) if respond_to?(:silence)
super(level, &block) super(level, &block)
else else
block.call(level) block.call(self)
end end
end end
end end
......
...@@ -148,7 +148,8 @@ def test_logger_silencing_works_for_broadcast ...@@ -148,7 +148,8 @@ def test_logger_silencing_works_for_broadcast
@logger.extend ActiveSupport::Logger.broadcast(another_logger) @logger.extend ActiveSupport::Logger.broadcast(another_logger)
@logger.debug "CORRECT DEBUG" @logger.debug "CORRECT DEBUG"
@logger.silence do @logger.silence do |logger|
assert_kind_of ActiveSupport::Logger, logger
@logger.debug "FAILURE" @logger.debug "FAILURE"
@logger.error "CORRECT ERROR" @logger.error "CORRECT ERROR"
end end
...@@ -169,7 +170,8 @@ def test_broadcast_silencing_does_not_break_plain_ruby_logger ...@@ -169,7 +170,8 @@ def test_broadcast_silencing_does_not_break_plain_ruby_logger
@logger.extend ActiveSupport::Logger.broadcast(another_logger) @logger.extend ActiveSupport::Logger.broadcast(another_logger)
@logger.debug "CORRECT DEBUG" @logger.debug "CORRECT DEBUG"
@logger.silence do @logger.silence do |logger|
assert_kind_of ActiveSupport::Logger, logger
@logger.debug "FAILURE" @logger.debug "FAILURE"
@logger.error "CORRECT ERROR" @logger.error "CORRECT ERROR"
end end
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册