Changed logging of SQL statements to use the DEBUG level instead of INFO. Added logging of the request URI in the benchmark statement (makes it easy to grep for slow actions). Changed the default logging level in config/environment.rb to INFO for production (so SQL statements won't be logged)

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

8 files changed, 14 insertions, 3 deletions

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 0dd82275f0..fbcf57fe0e 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Added logging of the request URI in the benchmark statement (makes it easy to grep for slow actions)
+
 * Added javascript_include_tag :defaults shortcut that'll include all the default javascripts included with Action Pack (prototype, effects, controls, dragdrop)
 
 * Cache several controller variables that are expensive to calculate #1229 [skaes@web.de]
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 381effeab3..ae988c4488 100755
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -689,6 +689,10 @@ module ActionController #:nodoc:
         "#{@request.remote_ip} at #{Time.now.to_s}"
       end
       
+      def complete_request_uri
+        request.protocol + request.host + request.request_uri
+      end
+
       def close_session
         @session.close unless @session.nil? || Hash === @session
       end
diff --git a/actionpack/lib/action_controller/benchmarking.rb b/actionpack/lib/action_controller/benchmarking.rb
index 55aed1bca1..7af807227c 100644
--- a/actionpack/lib/action_controller/benchmarking.rb
+++ b/actionpack/lib/action_controller/benchmarking.rb
@@ -39,7 +39,7 @@ module ActionController #:nodoc:
         perform_action_without_benchmark
       else
         runtime = [Benchmark::measure{ perform_action_without_benchmark }.real, 0.0001].max
-        log_message  = "Completed in #{sprintf("%.5f", runtime)} (#{(1 / runtime).floor} reqs/sec)"
+        log_message  = "Completed #{complete_request_uri} in #{sprintf("%.5f", runtime)} (#{(1 / runtime).floor} reqs/sec)"
         log_message << rendering_runtime(runtime) if @rendering_runtime
         log_message << active_record_runtime(runtime) if Object.const_defined?("ActiveRecord") && ActiveRecord::Base.connected?
         logger.info(log_message)
diff --git a/actionpack/lib/action_view/helpers/benchmark_helper.rb b/actionpack/lib/action_view/helpers/benchmark_helper.rb
index 126f505a98..d43b1653ee 100644
--- a/actionpack/lib/action_view/helpers/benchmark_helper.rb
+++ b/actionpack/lib/action_view/helpers/benchmark_helper.rb
@@ -17,7 +17,7 @@ module ActionView
           block.call
         end
         
-        @logger.info("#{message} (#{bm.real})")
+        @logger.info("#{message} (#{sprintf("%.5f", bm.real})")
       end
     end
   end
diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index 86464919de..cf7d834af4 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Changed logging of SQL statements to use the DEBUG level instead of INFO
+
 * Added new Migrations framework for describing schema transformations in a way that can be easily applied across multiple databases #1604 [Tobias Luetke] See documentation under ActiveRecord::Migration and the additional support in the Rails rakefile/generator.
 
 * Added callback hooks to association collections #1549 [Florian Weber]. Example:
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
index b440f9b6ba..ea9b6442e7 100755
--- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -460,7 +460,7 @@ module ActiveRecord
         def log_info(sql, name, runtime)
           return unless @logger
 
-          @logger.info(
+          @logger.debug(
             format_log_entry(
               "#{name.nil? ? "SQL" : name} (#{sprintf("%f", runtime)})",
               sql.gsub(/ +/, " ")
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 17505f12bf..3b7471a577 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Changed the default logging level in config/environment.rb to INFO for production (so SQL statements won't be logged)
+
 * Added an EXPERIMENTAL gateway.cgi for getting high-speed performance through vanilla CGI using a long-running, DRb-backed server in the background (using script/listener and script/tracker) #1603 [Nicholas Seckar]
 
 * Added migration generator: ./script/generate migration add_system_settings
diff --git a/railties/environments/environment.rb b/railties/environments/environment.rb
index d01651a35c..46363a2b21 100644
--- a/railties/environments/environment.rb
+++ b/railties/environments/environment.rb
@@ -50,6 +50,7 @@ ActiveRecord::Base.establish_connection
 # Configure defaults if the included environment did not.
 begin
   RAILS_DEFAULT_LOGGER = Logger.new("#{RAILS_ROOT}/log/#{RAILS_ENV}.log")
+  RAILS_DEFAULT_LOGGER.level = (RAILS_ENV == 'production' ? Logger::INFO : Logger::DEBUG)
 rescue StandardError
   RAILS_DEFAULT_LOGGER = Logger.new(STDERR)
   RAILS_DEFAULT_LOGGER.level = Logger::WARN