aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-06-10 12:08:38 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-06-10 12:08:38 -0700
commit35c89a48037391a10de0d12aa094c988a576d900 (patch)
tree9d47f40c041d2aeabe60e60435ee89e81f8e76cd
parent5dfb01e25b68b8d0b184c861405ba2789343302f (diff)
parent01f8f29dc9420fa7ac5eff0e068dd639ef9d187a (diff)
downloadrails-35c89a48037391a10de0d12aa094c988a576d900.tar.gz
rails-35c89a48037391a10de0d12aa094c988a576d900.tar.bz2
rails-35c89a48037391a10de0d12aa094c988a576d900.zip
Merge pull request #6688 from c42engineering/buffered_logger_level_while_creation
BufferedLogger level while creation
-rw-r--r--activesupport/lib/active_support/buffered_logger.rb4
-rw-r--r--activesupport/test/buffered_logger_test.rb5
2 files changed, 7 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/buffered_logger.rb b/activesupport/lib/active_support/buffered_logger.rb
index b1b539a2ec..85fb41f318 100644
--- a/activesupport/lib/active_support/buffered_logger.rb
+++ b/activesupport/lib/active_support/buffered_logger.rb
@@ -45,7 +45,6 @@ module ActiveSupport
deprecate :auto_flushing
def initialize(log, level = DEBUG)
- @level = level
@log_dest = log
unless log.respond_to?(:write)
@@ -58,6 +57,7 @@ Automatic directory creation for '#{log}' is deprecated. Please make sure the d
end
@log = open_logfile log
+ self.level = level
end
def open_log(log, mode)
@@ -91,7 +91,7 @@ Automatic directory creation for '#{log}' is deprecated. Please make sure the d
end # end
def #{severity.downcase}? # def debug?
- #{severity} >= level # DEBUG >= @level
+ #{severity} >= level # DEBUG >= level
end # end
EOT
end
diff --git a/activesupport/test/buffered_logger_test.rb b/activesupport/test/buffered_logger_test.rb
index f975685ca5..ce677f8460 100644
--- a/activesupport/test/buffered_logger_test.rb
+++ b/activesupport/test/buffered_logger_test.rb
@@ -62,6 +62,11 @@ class BufferedLoggerTest < Test::Unit::TestCase
File.unlink fname
end
+ def test_should_default_logger_level_to_one_passed_while_creating_it
+ logger = Logger.new(@output, Logger::ERROR)
+ assert_equal Logger::ERROR, logger.level
+ end
+
def test_should_log_debugging_message_when_debugging
@logger.level = Logger::DEBUG
@logger.add(Logger::DEBUG, @message)