From 1afb56f4818381098c6ed0babc4a5899e324e2e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Tue, 3 May 2011 00:47:11 +0200 Subject: Instrumentation should have callbacks. --- actionpack/lib/action_controller/base.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'actionpack') diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 373df7fb55..ccf1632a14 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -207,14 +207,14 @@ module ActionController HttpAuthentication::Digest::ControllerMethods, HttpAuthentication::Token::ControllerMethods, - # Add instrumentations hooks at the bottom, to ensure they instrument - # all the methods properly. - Instrumentation, - # Before callbacks should also be executed the earliest as possible, so # also include them at the bottom. AbstractController::Callbacks, + # Add instrumentations hooks at the bottom, to ensure they instrument + # all the methods properly. + Instrumentation, + # The same with rescue, append it at the end to wrap as much as possible. Rescue ] -- cgit v1.2.3