diff options
| author | Leonel Galán <leonel@getstealz.com> | 2017-04-25 10:39:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-25 10:39:46 -0500 |
| commit | f5b2a0ef408f01dd9f12b456f5e4bb41ebb4cb76 (patch) | |
| tree | 4afabfef205d5fbd546946a16bc6cf5eb36279e9 /activejob/lib | |
| parent | 8648f289f01656b2258687126108c389127108e0 (diff) | |
| parent | b32d64df5e5160e25804c7019e2da76bd115f3a6 (diff) | |
| download | rails-f5b2a0ef408f01dd9f12b456f5e4bb41ebb4cb76.tar.gz rails-f5b2a0ef408f01dd9f12b456f5e4bb41ebb4cb76.tar.bz2 rails-f5b2a0ef408f01dd9f12b456f5e4bb41ebb4cb76.zip | |
Merge branch 'master' into bug/filtered_parameters_class
Diffstat (limited to 'activejob/lib')
| -rw-r--r-- | activejob/lib/active_job/logging.rb | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/activejob/lib/active_job/logging.rb b/activejob/lib/active_job/logging.rb index d7e2cd03e3..f46d5c68a8 100644 --- a/activejob/lib/active_job/logging.rb +++ b/activejob/lib/active_job/logging.rb @@ -74,9 +74,16 @@ module ActiveJob end def perform(event) - info do - job = event.payload[:job] - "Performed #{job.class.name} (Job ID: #{job.job_id}) from #{queue_name(event)} in #{event.duration.round(2)}ms" + job = event.payload[:job] + ex = event.payload[:exception_object] + if ex + error do + "Error performing #{job.class.name} (Job ID: #{job.job_id}) from #{queue_name(event)} in #{event.duration.round(2)}ms: #{ex.class} (#{ex.message}):\n" + Array(ex.backtrace).join("\n") + end + else + info do + "Performed #{job.class.name} (Job ID: #{job.job_id}) from #{queue_name(event)} in #{event.duration.round(2)}ms" + end end end |