Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Changed logging of SQL statements to use the DEBUG level instead of I…

…NFO. 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
  • Loading branch information...
commit 977b4be208c2c54eeaaf7b46953174ef402f49d4 1 parent 4fe0248
@dhh dhh authored
View
2  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]
View
4 actionpack/lib/action_controller/base.rb
@@ -689,6 +689,10 @@ def request_origin
"#{@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
View
2  actionpack/lib/action_controller/benchmarking.rb
@@ -39,7 +39,7 @@ def perform_action_with_benchmark
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)
View
2  actionpack/lib/action_view/helpers/benchmark_helper.rb
@@ -17,7 +17,7 @@ def benchmark(message = "Benchmarking", &block)
block.call
end
- @logger.info("#{message} (#{bm.real})")
+ @logger.info("#{message} (#{sprintf("%.5f", bm.real})")
end
end
end
View
2  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:
View
2  activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -460,7 +460,7 @@ def log(sql, name)
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(/ +/, " ")
View
2  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
View
1  railties/environments/environment.rb
@@ -50,6 +50,7 @@
# 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
Please sign in to comment.
Something went wrong with that request. Please try again.