Permalink
Browse files

Added X-Benchmark to all responses with the same benchmark data as go…

…es into the log [DHH]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6156 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 06669f8 commit c74c78c88d94a2e3362f9cb55a8a86b2760cfa71 @dhh dhh committed Feb 16, 2007
Showing with 12 additions and 5 deletions.
  1. +2 −0 actionpack/CHANGELOG
  2. +10 −5 actionpack/lib/action_controller/benchmarking.rb
View
@@ -1,5 +1,7 @@
*SVN*
+* Added X-Benchmark to all responses with the same benchmark data as goes into the log [DHH]
+
* Add Mime::Type convenience methods to check the current mime type. [Rick]
request.format.html? # => true if Mime::HTML
@@ -63,16 +63,21 @@ def perform_action_with_benchmark
unless logger
perform_action_without_benchmark
else
- runtime = [Benchmark::measure{ perform_action_without_benchmark }.real, 0.0001].max
+ 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 << rendering_runtime(runtime) if defined?(@rendering_runtime)
log_message << active_record_runtime(runtime) if Object.const_defined?("ActiveRecord") && ActiveRecord::Base.connected?
- log_message << " | #{headers["Status"]}"
- log_message << " [#{complete_request_uri rescue "unknown"}]"
- logger.info(log_message)
+
+ log_message_with_status = log_message.dup
+ log_message_with_status << " | #{headers["Status"]}"
+ log_message_with_status << " [#{complete_request_uri rescue "unknown"}]"
+
+ response.headers["X-Benchmark"] = log_message
+ logger.info(log_message_with_status)
end
end
-
+
+
private
def rendering_runtime(runtime)
" | Rendering: #{sprintf("%.5f", @rendering_runtime)} (#{sprintf("%d", (@rendering_runtime * 100) / runtime)}%)"

0 comments on commit c74c78c

Please sign in to comment.