Added X-Runtime to all responses with the request run time [DHH] (rename from X-Benchmark)

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

2 files changed, 7 insertions, 8 deletions

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 416bb81d2a..0641d62cee 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -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]
 
diff --git a/actionpack/lib/action_controller/benchmarking.rb b/actionpack/lib/action_controller/benchmarking.rb
index e9844337af..469976e532 100644
--- a/actionpack/lib/action_controller/benchmarking.rb
+++ b/actionpack/lib/action_controller/benchmarking.rb
@@ -64,16 +64,15 @@ 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 << 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
 
@@ -91,4 +90,4 @@ module ActionController #:nodoc:
         " | DB: #{sprintf("%.5f", db_runtime)} (#{sprintf("%d", db_percentage)}%)"
       end
   end
-end
+end
\ No newline at end of file