From 7927fc2ff77543a0ab151ac1cb3d60318e2dfa68 Mon Sep 17 00:00:00 2001
From: Doug Fales <doug@getharvest.com>
Date: Tue, 18 Jan 2011 15:36:08 -0700
Subject: [PATCH] A patch so that http status codes are still included in logs
 even during an exception [#6333 state:resolved]
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: José Valim <jose.valim@gmail.com>
---
 .../lib/action_controller/log_subscriber.rb       |  6 +++++-
 actionpack/test/controller/log_subscriber_test.rb | 15 +++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/actionpack/lib/action_controller/log_subscriber.rb b/actionpack/lib/action_controller/log_subscriber.rb
index 3b19310a69732..3fae697cc3755 100644
--- a/actionpack/lib/action_controller/log_subscriber.rb
+++ b/actionpack/lib/action_controller/log_subscriber.rb
@@ -16,7 +16,11 @@ def process_action(event)
       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)
diff --git a/actionpack/test/controller/log_subscriber_test.rb b/actionpack/test/controller/log_subscriber_test.rb
index cac08811331f9..21bbd83653eed 100644
--- a/actionpack/test/controller/log_subscriber_test.rb
+++ b/actionpack/test/controller/log_subscriber_test.rb
@@ -32,6 +32,11 @@ def with_page_cache
       cache_page("Super soaker", "/index.html")
       render :nothing => true
     end
+    
+    def with_exception
+      raise Exception
+    end
+    
   end
 end
 
@@ -168,6 +173,16 @@ def test_with_page_cache
   ensure
     @controller.config.perform_caching = true
   end
+  
+  def test_process_action_with_exception_includes_http_status_code
+    begin
+     get :with_exception
+     wait
+   rescue Exception => e      
+   end
+   assert_equal 2, logs.size
+   assert_match(/Completed 500/, logs.last)
+  end
 
   def logs
     @logs ||= @logger.logged(:info)