diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-04-13 05:16:52 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-04-13 05:16:52 +0000 |
| commit | 908e9a17d8166d9b83609ec3aa877717a21d8ab7 (patch) | |
| tree | 6420b491024e5276fede0c3500440a3335ac4df4 /activerecord/lib | |
| parent | c29db9f210c81a757e035ee6c8e1a055f6b676b3 (diff) | |
| download | rails-908e9a17d8166d9b83609ec3aa877717a21d8ab7.tar.gz rails-908e9a17d8166d9b83609ec3aa877717a21d8ab7.tar.bz2 rails-908e9a17d8166d9b83609ec3aa877717a21d8ab7.zip | |
Fixed that Base.silence should restore the old logger level when done, not just set it to DEBUG #1084 [yon@milliped.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1155 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib')
| -rwxr-xr-x | activerecord/lib/active_record/base.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 3a1a590be8..7ef6532e52 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -662,9 +662,10 @@ module ActiveRecord #:nodoc: # Silences the logger for the duration of the block. def silence result = nil + old_logger_level = logger.level if logger logger.level = Logger::ERROR if logger result = yield - logger.level = Logger::DEBUG if logger + logger.level = old_logger_level if logger return result end |