From 5e8e8d6564b81514870773b3b5de9d5746b1f1e2 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Tue, 6 Sep 2005 16:48:18 +0000
Subject: [PATCH] Added use_silence parameter to ActiveRecord::Base.benchmark
 that can be passed false to include all logging statements during the
 benchmark block. Added ActionController::Base.benchmark and
 ActionController::Base.silence to allow for easy benchmarking and turning off
 the log

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2140 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 actionpack/CHANGELOG                          |  2 ++
 .../lib/action_controller/benchmarking.rb     | 28 +++++++++++++++++--
 activerecord/CHANGELOG                        |  2 ++
 activerecord/lib/active_record/base.rb        | 16 +++++++----
 4 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 007847c42c..636479c3e5 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Added ActionController::Base.benchmark and ActionController::Base.silence to allow for easy benchmarking and turning off the log
+
 * Updated vendor copy of html-scanner to support better xml parsing
 
 * Added :popup option to UrlHelper#link_to #1996 [gabriel.gironda@gmail.com]. Examples:
diff --git a/actionpack/lib/action_controller/benchmarking.rb b/actionpack/lib/action_controller/benchmarking.rb
index 52820c6908..b7c7eae8e9 100644
--- a/actionpack/lib/action_controller/benchmarking.rb
+++ b/actionpack/lib/action_controller/benchmarking.rb
@@ -6,13 +6,37 @@ module ActionController #:nodoc:
   module Benchmarking #:nodoc:
     def self.append_features(base)
       super
-      base.class_eval {
+      base.extend(ClassMethods)
+      base.class_eval do
         alias_method :perform_action_without_benchmark, :perform_action
         alias_method :perform_action, :perform_action_with_benchmark
 
         alias_method :render_without_benchmark, :render
         alias_method :render, :render_with_benchmark
-      }
+      end
+    end
+
+    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
+          result = nil
+          seconds = Benchmark.realtime { result = use_silence ? silence { yield } : yield }
+          logger.info "#{title} (#{sprintf("%f", seconds)})"
+          result
+        else
+          yield
+        end
+      end
+
+      # Silences the logger for the duration of the block.
+      def silence
+        old_logger_level, logger.level = logger.level, Logger::ERROR if logger
+        yield
+      ensure
+        logger.level = old_logger_level if logger
+      end
     end
 
     def render_with_benchmark(options = nil, deprecated_status = nil)
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index be367e52c0..2c60938bda 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Added use_silence parameter to ActiveRecord::Base.benchmark that can be passed false to include all logging statements during the benchmark block
+
 * Make sure the schema_info table is created before querying the current version #1903
 
 * Fixtures ignore table name prefix and suffix #1987 [Jakob S]
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 6180f45fed..a6ce28685c 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -714,11 +714,17 @@ def sanitize(object) #:nodoc:
       #     project.create_manager("name" => "David")
       #     project.milestones << Milestone.find(:all)
       #   end
-      def benchmark(title)
-        result = nil
-        seconds = Benchmark.realtime { result = silence { yield } }
-        logger.info "#{title} (#{sprintf("%f", seconds)})" if logger
-        return result
+      #
+      # The loggings of the multiple statements is turned off unless <tt>use_silence</tt> is set to false.
+      def benchmark(title, use_silence = true)
+        if logger
+          result = nil
+          seconds = Benchmark.realtime { result = use_silence ? silence { yield } : yield }
+          logger.info "#{title} (#{sprintf("%f", seconds)})"
+          result
+        else
+          yield
+        end
       end
 
       # Silences the logger for the duration of the block.
-- 
GitLab