diff options
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rwxr-xr-x | actionpack/lib/action_controller/base.rb | 4 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/benchmarking.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/helpers/benchmark_helper.rb | 2 |
4 files changed, 8 insertions, 2 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 |