Only do benchmarking if log level matches and log caching

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2141 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 7 insertions, 3 deletions

diff --git a/actionpack/lib/action_controller/benchmarking.rb b/actionpack/lib/action_controller/benchmarking.rb
index b7c7eae8e9..587bc29d42 100644
--- a/actionpack/lib/action_controller/benchmarking.rb
+++ b/actionpack/lib/action_controller/benchmarking.rb
@@ -19,11 +19,15 @@ module ActionController #:nodoc:
     module ClassMethods
       # Log and benchmark the workings of a single block and silence whatever logging that may have happened inside it 
       # (unless <tt>use_silence</tt> is set to false).
-      def benchmark(title, use_silence = true)
-        if logger
+      #
+      # The benchmark is only recorded if the current level of the logger matches the <tt>log_level</tt>, 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.
+      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} (#{sprintf("%f", seconds)})"
+          logger.add(log_level, "#{title} (#{sprintf("%f", seconds)})")
           result
         else
           yield