aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-01-15 14:16:52 +0100
committerJosé Valim <jose.valim@gmail.com>2010-01-15 14:16:52 +0100
commit4598d8874948268e1162c1ef75d0bd565b1e0e64 (patch)
tree3f24f8073b41af215e4e45f2200eb30d2338f678 /actionpack/lib/action_dispatch
parent5252f5c1c96001795d3e723ad8e48117e34c045b (diff)
downloadrails-4598d8874948268e1162c1ef75d0bd565b1e0e64.tar.gz
rails-4598d8874948268e1162c1ef75d0bd565b1e0e64.tar.bz2
rails-4598d8874948268e1162c1ef75d0bd565b1e0e64.zip
Ensure log is flushed and tailed on failures.
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r--actionpack/lib/action_dispatch/middleware/callbacks.rb7
1 files changed, 3 insertions, 4 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