diff options
| author | Jesse Storimer <jstorimer@gmail.com> | 2011-07-18 13:37:23 -0400 |
|---|---|---|
| committer | Jesse Storimer <jstorimer@gmail.com> | 2011-07-18 13:42:07 -0400 |
| commit | ac81af40c0564edbd7e79e00cf8211557d9a761b (patch) | |
| tree | 82e6f05af197113267c7029248056f14d7137e45 /actionpack/lib/action_controller | |
| parent | da144894e958770c84692065ec260aea2853afe9 (diff) | |
| download | rails-ac81af40c0564edbd7e79e00cf8211557d9a761b.tar.gz rails-ac81af40c0564edbd7e79e00cf8211557d9a761b.tar.bz2 rails-ac81af40c0564edbd7e79e00cf8211557d9a761b.zip | |
Ensure that status codes are logged properly
Needed to move AC::Metal::Instrumentation before AM::Metal::Rescue
so that status codes rendered from rescue_from blocks are logged
properly.
Diffstat (limited to 'actionpack/lib/action_controller')
| -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 d14c5f940b..ce56d8bc71 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -212,16 +212,16 @@ module ActionController # also include them at the bottom. AbstractController::Callbacks, + # Append rescue at the bottom to wrap as much as possible. + Rescue, + # Add instrumentations hooks at the bottom, to ensure they instrument # all the methods properly. Instrumentation, # Params wrapper should come before instrumentation so they are # properly showed in logs - ParamsWrapper, - - # The same with rescue, append it at the end to wrap as much as possible. - Rescue + ParamsWrapper ] MODULES.each do |mod| |