From dd76b3bbc8c4b161e6d4f77012c90960f68d1ac3 Mon Sep 17 00:00:00 2001
From: Yves Senn <yves.senn@gmail.com>
Date: Sun, 16 Sep 2012 21:48:24 +0200
Subject: log 404 status when ActiveRecord::RecordNotFound was raised (#7646)

Conflicts:
	actionpack/CHANGELOG.md
	actionpack/lib/action_controller/log_subscriber.rb
---
 actionpack/CHANGELOG.md                                   |  4 ++++
 actionpack/lib/action_controller/log_subscriber.rb        |  3 ++-
 .../lib/action_dispatch/middleware/exception_wrapper.rb   |  8 ++++++--
 actionpack/test/controller/log_subscriber_test.rb         | 15 +++++++++++++++
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 91274f35ab..bfb561a154 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## Rails 3.2.9 (unreleased) ##
 
+*   Fix #7646, the log now displays the correct status code when an exception is raised.
+
+    *Yves Senn*
+
 *   Fix handling of date selects when using both disabled and discard options.
     Fixes #7431.
 
diff --git a/actionpack/lib/action_controller/log_subscriber.rb b/actionpack/lib/action_controller/log_subscriber.rb
index 4c76f4c43b..194f26aefc 100644
--- a/actionpack/lib/action_controller/log_subscriber.rb
+++ b/actionpack/lib/action_controller/log_subscriber.rb
@@ -20,7 +20,8 @@ module ActionController
 
       status = payload[:status]
       if status.nil? && payload[:exception].present?
-        status = Rack::Utils.status_code(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?
diff --git a/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb b/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb
index c0532c80c4..0f49dc65bf 100644
--- a/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb
+++ b/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb
@@ -34,7 +34,7 @@ module ActionDispatch
     end
 
     def status_code
-      Rack::Utils.status_code(@@rescue_responses[@exception.class.name])
+      self.class.status_code_for_exception(@exception.class.name)
     end
 
     def application_trace
@@ -49,6 +49,10 @@ module ActionDispatch
       clean_backtrace(:all)
     end
 
+    def self.status_code_for_exception(class_name)
+      Rack::Utils.status_code(@@rescue_responses[class_name])
+    end
+
     private
 
     def original_exception(exception)
@@ -75,4 +79,4 @@ module ActionDispatch
       @backtrace_cleaner ||= @env['action_dispatch.backtrace_cleaner']
     end
   end
-end
\ No newline at end of file
+end
diff --git a/actionpack/test/controller/log_subscriber_test.rb b/actionpack/test/controller/log_subscriber_test.rb
index 700fd788fa..a72b6dde1a 100644
--- a/actionpack/test/controller/log_subscriber_test.rb
+++ b/actionpack/test/controller/log_subscriber_test.rb
@@ -54,6 +54,10 @@ module Another
     def with_rescued_exception
       raise SpecialException
     end
+
+    def with_action_not_found
+      raise AbstractController::ActionNotFound
+    end
   end
 end
 
@@ -225,6 +229,17 @@ class ACLogSubscriberTest < ActionController::TestCase
     assert_match(/Completed 406/, logs.last)
   end
 
+  def test_process_action_with_with_action_not_found_logs_404
+    begin
+      get :with_action_not_found
+      wait
+    rescue AbstractController::ActionNotFound
+    end
+
+    assert_equal 2, logs.size
+    assert_match(/Completed 404/, logs.last)
+  end
+
   def logs
     @logs ||= @logger.logged(:info)
   end
-- 
cgit v1.2.3