delegating and deprecating logger#silence. fixes #4159

3 files changed, 33 insertions, 16 deletions

diff --git a/activesupport/lib/active_support/core_ext/logger.rb b/activesupport/lib/active_support/core_ext/logger.rb
index e63a0a9ed9..ca0f382966 100644
--- a/activesupport/lib/active_support/core_ext/logger.rb
+++ b/activesupport/lib/active_support/core_ext/logger.rb
@@ -1,4 +1,5 @@
 require 'active_support/core_ext/class/attribute_accessors'
+require 'active_support/deprecation'
 
 # Adds the 'around_level' method to Logger.
 class Logger #:nodoc:
@@ -49,6 +50,7 @@ class Logger
       yield self
     end
   end
+  deprecate :silence
 
   alias :old_datetime_format= :datetime_format=
   # Logging date-time format (string passed to +strftime+). Ignored if the formatter
diff --git a/activesupport/lib/active_support/tagged_logging.rb b/activesupport/lib/active_support/tagged_logging.rb
index 0f3ac0c132..a3a2c48817 100644
--- a/activesupport/lib/active_support/tagged_logging.rb
+++ b/activesupport/lib/active_support/tagged_logging.rb
@@ -1,4 +1,5 @@
 require 'active_support/core_ext/object/blank'
+require 'active_support/deprecation'
 require 'logger'
 
 module ActiveSupport
@@ -26,6 +27,11 @@ module ActiveSupport
       new_tags.size.times { tags.pop }
     end
 
+    def silence(temporary_level = ERROR, &block)
+      @logger.silience(temporary_level, &block)
+    end
+    deprecate :silence
+
     def add(severity, message = nil, progname = nil, &block)
       @logger.add(severity, "#{tags_text}#{message}", progname, &block)
     end
diff --git a/activesupport/test/clean_logger_test.rb b/activesupport/test/clean_logger_test.rb
index 2cc46904b4..970e97d492 100644
--- a/activesupport/test/clean_logger_test.rb
+++ b/activesupport/test/clean_logger_test.rb
@@ -1,8 +1,11 @@
 require 'abstract_unit'
 require 'stringio'
 require 'active_support/core_ext/logger'
+require 'active_support/testing/deprecation'
 
 class CleanLoggerTest < Test::Unit::TestCase
+  include ActiveSupport::Testing::Deprecation
+
   def setup
     @out = StringIO.new
     @logger = Logger.new(@out)
@@ -14,28 +17,34 @@ class CleanLoggerTest < Test::Unit::TestCase
   end
 
   def test_silence
-    # Without yielding self.
-    @logger.silence do
-      @logger.debug  'debug'
-      @logger.info   'info'
-      @logger.warn   'warn'
-      @logger.error  'error'
-      @logger.fatal  'fatal'
+    assert_deprecated do
+      # Without yielding self.
+      @logger.silence do
+        @logger.debug  'debug'
+        @logger.info   'info'
+        @logger.warn   'warn'
+        @logger.error  'error'
+        @logger.fatal  'fatal'
+      end
     end
 
-    # Yielding self.
-    @logger.silence do |logger|
-      logger.debug  'debug'
-      logger.info   'info'
-      logger.warn   'warn'
-      logger.error  'error'
-      logger.fatal  'fatal'
+    assert_deprecated do
+      # Yielding self.
+      @logger.silence do |logger|
+        logger.debug  'debug'
+        logger.info   'info'
+        logger.warn   'warn'
+        logger.error  'error'
+        logger.fatal  'fatal'
+      end
     end
 
     # Silencer off.
     Logger.silencer = false
-    @logger.silence do |logger|
-      logger.warn   'unsilenced'
+    assert_deprecated do
+      @logger.silence do |logger|
+        logger.warn   'unsilenced'
+      end
     end
     Logger.silencer = true