From 308e84e982b940983b4b3d5b41b0b3ac11fbae40 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Mon, 24 Oct 2016 18:26:13 +0800 Subject: `Broadcast#silence` breaks custom loggers that does not include `LoggerSilence`. --- activesupport/lib/active_support/logger.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'activesupport/lib/active_support/logger.rb') diff --git a/activesupport/lib/active_support/logger.rb b/activesupport/lib/active_support/logger.rb index 3ba6461b57..ea09d7d2df 100644 --- a/activesupport/lib/active_support/logger.rb +++ b/activesupport/lib/active_support/logger.rb @@ -59,14 +59,14 @@ module ActiveSupport define_method(:silence) do |level = Logger::ERROR, &block| if logger.respond_to?(:silence) logger.silence(level) do - if respond_to?(:silence) + if defined?(super) super(level, &block) else block.call(self) end end else - if respond_to?(:silence) + if defined?(super) super(level, &block) else block.call(self) -- cgit v1.2.3