Improved the silence method on the logger to ensure restoring the old level #1240 [bitsweat

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1277 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 4 insertions, 6 deletions

diff --git a/activesupport/lib/active_support/clean_logger.rb b/activesupport/lib/active_support/clean_logger.rb
index df9a6867ec..3632a27c40 100644
--- a/activesupport/lib/active_support/clean_logger.rb
+++ b/activesupport/lib/active_support/clean_logger.rb
@@ -2,13 +2,11 @@ require 'logger'
 
 class Logger #:nodoc:
   # Silences the logger for the duration of the block.
-  def silence
-    result = nil
-    old_logger_level = level
-    self.level = Logger::ERROR
-    result = yield
+  def silence(temporary_level = Logger::ERROR)
+    old_logger_level, self.level = level, temporary_level
+    yield
+  ensure
     self.level = old_logger_level
-    return result
   end
 
   private