diff options
| author | Doug Fales <doug@getharvest.com> | 2011-01-18 15:36:08 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-01-25 20:12:22 +0100 |
| commit | 7927fc2ff77543a0ab151ac1cb3d60318e2dfa68 (patch) | |
| tree | f71557b6757a43e05852cb5a3bbe6886d0e3a88b /actionpack/lib/action_controller | |
| parent | 59f3218463228ca2301857cd7bf4f82f308924a6 (diff) | |
| download | rails-7927fc2ff77543a0ab151ac1cb3d60318e2dfa68.tar.gz rails-7927fc2ff77543a0ab151ac1cb3d60318e2dfa68.tar.bz2 rails-7927fc2ff77543a0ab151ac1cb3d60318e2dfa68.zip | |
A patch so that http status codes are still included in logs even during an exception [#6333 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/log_subscriber.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/log_subscriber.rb b/actionpack/lib/action_controller/log_subscriber.rb index 3b19310a69..3fae697cc3 100644 --- a/actionpack/lib/action_controller/log_subscriber.rb +++ b/actionpack/lib/action_controller/log_subscriber.rb @@ -16,7 +16,11 @@ module ActionController payload = event.payload additions = ActionController::Base.log_process_action(payload) - message = "Completed #{payload[:status]} #{Rack::Utils::HTTP_STATUS_CODES[payload[:status]]} in %.0fms" % event.duration + status = payload[:status] + if status.nil? && payload[:exception].present? + status = Rack::Utils.status_code(ActionDispatch::ShowExceptions.rescue_responses[payload[:exception].first]) rescue nil + end + message = "Completed #{status} #{Rack::Utils::HTTP_STATUS_CODES[status]} in %.0fms" % event.duration message << " (#{additions.join(" | ")})" unless additions.blank? info(message) |