diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-02 14:16:15 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-02 14:16:15 -0300 |
| commit | 2d743b528cf8ee2a8dc016a5dd0d54bf7cbc34e4 (patch) | |
| tree | 52add4e98ac9bd49f6e11013faf3ad0c1d6e9961 /actionpack/lib/action_controller/metal | |
| parent | 873870df4cbb0b79d1cb6d811cf68d3aa9fdc625 (diff) | |
| parent | 2fde159f6b22fa45f132ba25c48eb3c371ead949 (diff) | |
| download | rails-2d743b528cf8ee2a8dc016a5dd0d54bf7cbc34e4.tar.gz rails-2d743b528cf8ee2a8dc016a5dd0d54bf7cbc34e4.tar.bz2 rails-2d743b528cf8ee2a8dc016a5dd0d54bf7cbc34e4.zip | |
Merge pull request #17978 from kommen/fixed-pr-14903
Ensure append_info_to_payload is called even if an exception is raised.
Conflicts:
actionpack/CHANGELOG.md
Diffstat (limited to 'actionpack/lib/action_controller/metal')
| -rw-r--r-- | actionpack/lib/action_controller/metal/instrumentation.rb | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/metal/instrumentation.rb b/actionpack/lib/action_controller/metal/instrumentation.rb index bef7545e71..a3e1a71b0a 100644 --- a/actionpack/lib/action_controller/metal/instrumentation.rb +++ b/actionpack/lib/action_controller/metal/instrumentation.rb @@ -28,10 +28,13 @@ module ActionController ActiveSupport::Notifications.instrument("start_processing.action_controller", raw_payload.dup) ActiveSupport::Notifications.instrument("process_action.action_controller", raw_payload) do |payload| - result = super - payload[:status] = response.status - append_info_to_payload(payload) - result + begin + result = super + payload[:status] = response.status + result + ensure + append_info_to_payload(payload) + end end end |