From f2a89d7862313505562186620a07d498190971c3 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Tue, 6 Sep 2005 17:47:31 +0000 Subject: Give AR the new benchmark method too git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2143 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/lib/active_record/base.rb | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 4aedbea322..64f248cf90 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -706,8 +706,7 @@ module ActiveRecord #:nodoc: connection.quote(object) end - # Log and benchmark multiple statements in a single block. - # Usage (hides all the SQL calls for the individual actions and calculates total runtime for them all): + # Log and benchmark multiple statements in a single block. Example: # # Project.benchmark("Creating project") do # project = Project.create("name" => "stuff") @@ -715,12 +714,16 @@ 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 loggings of the multiple statements is turned off unless use_silence is set to false. - def benchmark(title, use_silence = true) - if logger + def benchmark(title, log_level = Logger::DEBUG, use_silence = true) + if logger && logger.level == log_level result = nil seconds = Benchmark.realtime { result = use_silence ? silence { yield } : yield } - logger.info "#{title} (#{'%.5f' % seconds)})" + logger.add(log_level, "#{title} (#{'%.5f' % seconds})") result else yield -- cgit v1.2.3