diff options
-rwxr-xr-x | actionpack/lib/action_controller/base.rb | 4 | ||||
-rw-r--r-- | actionpack/lib/action_controller/benchmarking.rb | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 9291129e3d..e39c520dba 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -628,7 +628,7 @@ module ActionController #:nodoc: def render_file(template_path, status = nil, use_full_path = false) add_variables_to_assigns assert_existance_of_template_file(template_path) if use_full_path - logger.info("Rendering #{template_path}" + (status ? "(#{status})" : '')) if logger + logger.info("Rendering #{template_path}" + (status ? " (#{status})" : '')) if logger render_text(@template.render_file(template_path, use_full_path), status) end @@ -814,7 +814,7 @@ module ActionController #:nodoc: end def log_processing - logger.info "\n\nProcessing #{controller_class_name}\##{action_name} (for #{request_origin})" + logger.info "\n\nProcessing #{controller_class_name}\##{action_name} (for #{request_origin}) [#{request.method.to_s.upcase}]" logger.info " Parameters: #{@params.inspect}" end diff --git a/actionpack/lib/action_controller/benchmarking.rb b/actionpack/lib/action_controller/benchmarking.rb index c2b4c10d73..e1c3bbbdc1 100644 --- a/actionpack/lib/action_controller/benchmarking.rb +++ b/actionpack/lib/action_controller/benchmarking.rb @@ -70,6 +70,7 @@ module ActionController #:nodoc: log_message = "Completed 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? + log_message << " | #{response.body.size} bytes (#{headers["Status"]})" log_message << " [#{complete_request_uri rescue "unknown"}]" logger.info(log_message) end |