diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2018-12-21 17:36:30 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-21 17:36:30 +0900 |
| commit | b75192845a6aa89b35c857e9f3de443ae1a0fbd5 (patch) | |
| tree | c300f14774b7556a21514ee35a45b850fae7806b /actionpack/lib/action_controller | |
| parent | 07235ec37130437cb97c90e14fc8d990f46e4024 (diff) | |
| parent | 892e38c78e03c11afaa5f01d995e3a21bd92b415 (diff) | |
| download | rails-b75192845a6aa89b35c857e9f3de443ae1a0fbd5.tar.gz rails-b75192845a6aa89b35c857e9f3de443ae1a0fbd5.tar.bz2 rails-b75192845a6aa89b35c857e9f3de443ae1a0fbd5.zip | |
Merge pull request #34764 from kamipo/avoid_redundant_begin
Enable `Style/RedundantBegin` cop to avoid newly adding redundant begin block
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/metal/instrumentation.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/metal/instrumentation.rb b/actionpack/lib/action_controller/metal/instrumentation.rb index be9449629f..51fac08749 100644 --- a/actionpack/lib/action_controller/metal/instrumentation.rb +++ b/actionpack/lib/action_controller/metal/instrumentation.rb @@ -30,13 +30,11 @@ module ActionController ActiveSupport::Notifications.instrument("start_processing.action_controller", raw_payload.dup) ActiveSupport::Notifications.instrument("process_action.action_controller", raw_payload) do |payload| - begin - result = super + super.tap do payload[:status] = response.status - result - ensure - append_info_to_payload(payload) end + ensure + append_info_to_payload(payload) end end |