diff options
| author | José Valim <jose.valim@gmail.com> | 2011-07-18 11:05:37 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-07-18 11:05:37 -0700 |
| commit | b475f74da5ec2ac4048f70d9063a1d4c0d63b546 (patch) | |
| tree | d0b602140f2506ec9480b690b70fa0370805125b /actionpack/lib | |
| parent | 8efc0f1f340ef50362b87d428ebff85a2f66cb16 (diff) | |
| parent | ac81af40c0564edbd7e79e00cf8211557d9a761b (diff) | |
| download | rails-b475f74da5ec2ac4048f70d9063a1d4c0d63b546.tar.gz rails-b475f74da5ec2ac4048f70d9063a1d4c0d63b546.tar.bz2 rails-b475f74da5ec2ac4048f70d9063a1d4c0d63b546.zip | |
Merge pull request #2133 from jstorimer/ensure-status-codes-are-logged-properly
Ensure that status codes are logged properly
Diffstat (limited to 'actionpack/lib')
| -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| |