diff options
| author | José Valim <jose.valim@gmail.com> | 2011-05-03 00:47:11 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-05-03 01:04:57 +0200 |
| commit | 1afb56f4818381098c6ed0babc4a5899e324e2e5 (patch) | |
| tree | 01e05a4bb89b4e9fe412c353c1daa8e66c7a07f3 /actionpack | |
| parent | 4bddc06e83acecce662b4282159c5eb0096c4783 (diff) | |
| download | rails-1afb56f4818381098c6ed0babc4a5899e324e2e5.tar.gz rails-1afb56f4818381098c6ed0babc4a5899e324e2e5.tar.bz2 rails-1afb56f4818381098c6ed0babc4a5899e324e2e5.zip | |
Instrumentation should have callbacks.
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 8 |
1 files changed, 4 insertions, 4 deletions
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 ] |