diff options
author | Eileen M. Uchitelle <eileencodes@users.noreply.github.com> | 2018-10-10 09:31:31 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-10 09:31:31 -0400 |
commit | 8ecb75e40510dd79cef173326a67fe93b274b2b7 (patch) | |
tree | 1d160425c9f10f382071b47b72cf2d30acaa60b7 /actionpack/lib/action_controller | |
parent | a52c6989a0aacc50b35891265a0b5631e1ec2370 (diff) | |
parent | e8c1be4ae7797f3ede588d2cf04a0155b4d6ce4a (diff) | |
download | rails-8ecb75e40510dd79cef173326a67fe93b274b2b7.tar.gz rails-8ecb75e40510dd79cef173326a67fe93b274b2b7.tar.bz2 rails-8ecb75e40510dd79cef173326a67fe93b274b2b7.zip |
Merge pull request #34136 from rails/add-allocations-to-template-renderer
Add allocations to template renderer subscription
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r-- | actionpack/lib/action_controller/log_subscriber.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/log_subscriber.rb b/actionpack/lib/action_controller/log_subscriber.rb index 6de1fb2c19..afbd38e7fe 100644 --- a/actionpack/lib/action_controller/log_subscriber.rb +++ b/actionpack/lib/action_controller/log_subscriber.rb @@ -18,14 +18,17 @@ module ActionController def process_action(event) info do - payload = event.payload + payload = event.payload additions = ActionController::Base.log_process_action(payload) - status = payload[:status] + if status.nil? && payload[:exception].present? exception_class_name = payload[:exception].first status = ActionDispatch::ExceptionWrapper.status_code_for_exception(exception_class_name) end + + additions << "Allocations: #{event.allocations}" + message = +"Completed #{status} #{Rack::Utils::HTTP_STATUS_CODES[status]} in #{event.duration.round}ms" message << " (#{additions.join(" | ")})" unless additions.empty? message << "\n\n" if defined?(Rails.env) && Rails.env.development? |