diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-17 09:21:23 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-09-17 09:21:23 -0700 |
| commit | 8f0d332af385e1bbd931388f7c103b4743938a29 (patch) | |
| tree | ecbd10670d4728bbb67da64c148c489d2391f2dd /actionpack/lib/action_controller/log_subscriber.rb | |
| parent | 3c48b32f6e4a00e5d3d5d24988710894b992fb21 (diff) | |
| parent | dadfa9ab32669cda34f01a1cc06afbe97c8a0f79 (diff) | |
| download | rails-8f0d332af385e1bbd931388f7c103b4743938a29.tar.gz rails-8f0d332af385e1bbd931388f7c103b4743938a29.tar.bz2 rails-8f0d332af385e1bbd931388f7c103b4743938a29.zip | |
Merge pull request #7660 from senny/7646_wrong_status_code_on_not_found
log 404 status when ActiveRecord::RecordNotFound was raised (#7646)
Diffstat (limited to 'actionpack/lib/action_controller/log_subscriber.rb')
| -rw-r--r-- | actionpack/lib/action_controller/log_subscriber.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/log_subscriber.rb b/actionpack/lib/action_controller/log_subscriber.rb index a7c0e971e7..f41d1bb4b9 100644 --- a/actionpack/lib/action_controller/log_subscriber.rb +++ b/actionpack/lib/action_controller/log_subscriber.rb @@ -19,7 +19,8 @@ module ActionController status = payload[:status] if status.nil? && payload[:exception].present? - status = ActionDispatch::ExceptionWrapper.new({}, payload[:exception]).status_code + exception_class_name = payload[:exception].first + status = ActionDispatch::ExceptionWrapper.status_code_for_exception(exception_class_name) end message = "Completed #{status} #{Rack::Utils::HTTP_STATUS_CODES[status]} in %.0fms" % event.duration message << " (#{additions.join(" | ")})" unless additions.blank? |