Ensure log is flushed and tailed on failures.

2 files changed, 37 insertions, 7 deletions

diff --git a/actionpack/lib/action_dispatch/middleware/callbacks.rb b/actionpack/lib/action_dispatch/middleware/callbacks.rb
index 8098933e01..5ec406e134 100644
--- a/actionpack/lib/action_dispatch/middleware/callbacks.rb
+++ b/actionpack/lib/action_dispatch/middleware/callbacks.rb
@@ -43,11 +43,10 @@ module ActionDispatch
     def call(env)
       run_callbacks(:call) do
         run_callbacks(:prepare) if @prepare_each_request
-
-        ActiveSupport::Notifications.instrument "action_dispatch.callback" do
-          @app.call(env)
-        end
+        @app.call(env)
       end
+    ensure
+      ActiveSupport::Notifications.instrument "action_dispatch.callback"
     end
   end
 end
diff --git a/actionpack/test/dispatch/callbacks_test.rb b/actionpack/test/dispatch/callbacks_test.rb
index 8a2d56cfcc..f3ea5209f4 100644
--- a/actionpack/test/dispatch/callbacks_test.rb
+++ b/actionpack/test/dispatch/callbacks_test.rb
@@ -17,7 +17,7 @@ class DispatcherTest < Test::Unit::TestCase
     ActionDispatch::Callbacks.reset_callbacks(:call)
   end
 
-  def test_prepare_callbacks
+  def test_prepare_callbacks_with_cache_classes
     a = b = c = nil
     ActionDispatch::Callbacks.to_prepare { |*args| a = b = c = 1 }
     ActionDispatch::Callbacks.to_prepare { |*args| b = c = 2 }
@@ -39,6 +39,30 @@ class DispatcherTest < Test::Unit::TestCase
     assert_nil a || b || c
   end
 
+  def test_prepare_callbacks_without_cache_classes
+    a = b = c = nil
+    ActionDispatch::Callbacks.to_prepare { |*args| a = b = c = 1 }
+    ActionDispatch::Callbacks.to_prepare { |*args| b = c = 2 }
+    ActionDispatch::Callbacks.to_prepare { |*args| c = 3 }
+
+    # Ensure to_prepare callbacks are not run when defined
+    assert_nil a || b || c
+
+    # Run callbacks
+    dispatch(false)
+
+    assert_equal 1, a
+    assert_equal 2, b
+    assert_equal 3, c
+
+    # Make sure they are run again
+    a = b = c = nil
+    dispatch(false)
+    assert_equal 1, a
+    assert_equal 2, b
+    assert_equal 3, c
+  end
+
   def test_to_prepare_with_identifier_replaces
     ActionDispatch::Callbacks.to_prepare(:unique_id) { |*args| Foo.a, Foo.b = 1, 1 }
     ActionDispatch::Callbacks.to_prepare(:unique_id) { |*args| Foo.a = 2 }
@@ -66,10 +90,17 @@ class DispatcherTest < Test::Unit::TestCase
     dispatch
   end
 
+  def test_should_send_an_instrumentation_callback_for_async_processing_even_on_failure
+    ActiveSupport::Notifications.notifier.expects(:publish)
+    assert_raise RuntimeError do
+      dispatch { |env| raise "OMG" }
+    end
+  end
+
   private
 
-    def dispatch(cache_classes = true)
-      @dispatcher ||= ActionDispatch::Callbacks.new(DummyApp.new, !cache_classes)
+    def dispatch(cache_classes = true, &block)
+      @dispatcher ||= ActionDispatch::Callbacks.new(block || DummyApp.new, !cache_classes)
       @dispatcher.call({'rack.input' => StringIO.new('')})
     end