aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2007-10-07 18:54:36 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2007-10-07 18:54:36 +0000
commitc90d31eb376ebe331394112697ec33a22f61c2d8 (patch)
tree0451881f6e737772e5601bdcd9686ac5e9e76a70
parent2101c25faf6560f2689584eadd12fd715533766b (diff)
downloadrails-c90d31eb376ebe331394112697ec33a22f61c2d8.tar.gz
rails-c90d31eb376ebe331394112697ec33a22f61c2d8.tar.bz2
rails-c90d31eb376ebe331394112697ec33a22f61c2d8.zip
Correct BufferedLogger#level? checks. Closes #9806.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7775 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--activesupport/CHANGELOG2
-rw-r--r--activesupport/lib/active_support/buffered_logger.rb2
-rw-r--r--activesupport/test/buffered_logger_test.rb7
3 files changed, 10 insertions, 1 deletions
diff --git a/activesupport/CHANGELOG b/activesupport/CHANGELOG
index e7d905540e..77432a7720 100644
--- a/activesupport/CHANGELOG
+++ b/activesupport/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Correct BufferedLogger#level? checks. #9806 [wildchild, Johan Sorensen]
+
* String#to_xs uses Eric Wong's fast_xs extension, if available, for Builder speedup. http://bogomips.org/fast_xs/ [Jeremy Kemper]
* Introduce BasicObject as Builder::BlankSlate for Ruby 1.9 forward compatibility. [Jeremy Kemper]
diff --git a/activesupport/lib/active_support/buffered_logger.rb b/activesupport/lib/active_support/buffered_logger.rb
index e666b7f0ed..37e6d200cd 100644
--- a/activesupport/lib/active_support/buffered_logger.rb
+++ b/activesupport/lib/active_support/buffered_logger.rb
@@ -70,7 +70,7 @@ module ActiveSupport
end
def #{severity.downcase}?
- @level == #{severity}
+ #{severity} >= @level
end
EOT
end
diff --git a/activesupport/test/buffered_logger_test.rb b/activesupport/test/buffered_logger_test.rb
index dc6b59aee9..5ce197eba8 100644
--- a/activesupport/test/buffered_logger_test.rb
+++ b/activesupport/test/buffered_logger_test.rb
@@ -85,6 +85,13 @@ class BufferedLoggerTest < Test::Unit::TestCase
assert !@output.string.empty?, @logger.buffer.size
end
end
+
+ def test_should_know_if_its_loglevel_is_below_a_given_level
+ ActiveSupport::BufferedLogger::Severity.constants.each do |level|
+ @logger.level = ActiveSupport::BufferedLogger::Severity.const_get(level) - 1
+ assert @logger.send("#{level.downcase}?"), "didn't know if it was #{level.downcase}? or below"
+ end
+ end
def test_should_auto_flush_every_n_messages
@logger.auto_flushing = 5