diff options
| author | kp <keith.j.payne@gmail.com> | 2016-02-10 17:44:54 +0000 |
|---|---|---|
| committer | kp <keith.j.payne@gmail.com> | 2016-02-10 17:44:54 +0000 |
| commit | ec4ae308a76bd86fb6eaf7fa8ee025af0063ee30 (patch) | |
| tree | 741019b3fbf474ff4cdeefdbeb6ff1f598ffcdfc /actionpack/lib/action_controller/log_subscriber.rb | |
| parent | 8641de93eb98d4ebdb0db2530c8c79c0c4e2f95e (diff) | |
| parent | 688996da7b25080a1a2ef74f5b4789f3e5eb670d (diff) | |
| download | rails-ec4ae308a76bd86fb6eaf7fa8ee025af0063ee30.tar.gz rails-ec4ae308a76bd86fb6eaf7fa8ee025af0063ee30.tar.bz2 rails-ec4ae308a76bd86fb6eaf7fa8ee025af0063ee30.zip | |
Merge remote-tracking branch 'origin/master' into actioncable_logging
Diffstat (limited to 'actionpack/lib/action_controller/log_subscriber.rb')
| -rw-r--r-- | actionpack/lib/action_controller/log_subscriber.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/log_subscriber.rb b/actionpack/lib/action_controller/log_subscriber.rb index 4c9f14e409..a0917b4fdb 100644 --- a/actionpack/lib/action_controller/log_subscriber.rb +++ b/actionpack/lib/action_controller/log_subscriber.rb @@ -25,7 +25,9 @@ module ActionController status = ActionDispatch::ExceptionWrapper.status_code_for_exception(exception_class_name) end message = "Completed #{status} #{Rack::Utils::HTTP_STATUS_CODES[status]} in #{event.duration.round}ms" - message << " (#{additions.join(" | ".freeze)})" unless additions.blank? + message << " (#{additions.join(" | ".freeze)})" unless additions.empty? + message << "\n\n" if defined?(Rails.env) && Rails.env.development? + message end end |