From 15b38efde8d997382da4b5e04cb9e7aaafb0fe57 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Fri, 21 Dec 2007 01:48:20 +0000 Subject: Benchmark logs for any level below or equal to the one specified, rather than just equal. Closes #10580 [Dan Manges] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8455 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/lib/active_record/base.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 2a3fe1bde4..512b04bcdf 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -1175,13 +1175,13 @@ module ActiveRecord #:nodoc: # project.milestones << Milestone.find(:all) # end # - # The benchmark is only recorded if the current level of the logger matches the log_level, which makes it - # easy to include benchmarking statements in production software that will remain inexpensive because the benchmark - # will only be conducted if the log level is low enough. + # The benchmark is only recorded if the current level of the logger is less than or equal to the log_level, + # which makes it easy to include benchmarking statements in production software that will remain inexpensive because + # the benchmark will only be conducted if the log level is low enough. # # The logging of the multiple statements is turned off unless use_silence is set to false. def benchmark(title, log_level = Logger::DEBUG, use_silence = true) - if logger && logger.level == log_level + if logger && logger.level <= log_level result = nil seconds = Benchmark.realtime { result = use_silence ? silence { yield } : yield } logger.add(log_level, "#{title} (#{'%.5f' % seconds})") -- cgit v1.2.3