Skip to content

Commit

Permalink
Added X-Runtime to all responses with the request run time [DHH] (ren…
Browse files Browse the repository at this point in the history
…ame from X-Benchmark)

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6157 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information
dhh committed Feb 17, 2007
1 parent c74c78c commit cfa7df3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
2 changes: 1 addition & 1 deletion actionpack/CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
*SVN*

* Added X-Benchmark to all responses with the same benchmark data as goes into the log [DHH]
* Added X-Runtime to all responses with the request run time [DHH]

* Add Mime::Type convenience methods to check the current mime type. [Rick]

Expand Down
13 changes: 6 additions & 7 deletions actionpack/lib/action_controller/benchmarking.rb
Original file line number Diff line number Diff line change
Expand Up @@ -64,16 +64,15 @@ 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 << rendering_runtime(runtime) if defined?(@rendering_runtime)
log_message << active_record_runtime(runtime) if Object.const_defined?("ActiveRecord") && ActiveRecord::Base.connected?

log_message_with_status = log_message.dup
log_message_with_status << " | #{headers["Status"]}"
log_message_with_status << " [#{complete_request_uri rescue "unknown"}]"
log_message << " | #{headers["Status"]}"
log_message << " [#{complete_request_uri rescue "unknown"}]"

response.headers["X-Benchmark"] = log_message
logger.info(log_message_with_status)
logger.info(log_message)
response.headers["X-Runtime"] = sprintf("%.5f", runtime)
end
end

Expand All @@ -91,4 +90,4 @@ def active_record_runtime(runtime)
" | DB: #{sprintf("%.5f", db_runtime)} (#{sprintf("%d", db_percentage)}%)"
end
end
end
end

0 comments on commit cfa7df3

Please sign in to comment.