Skip logging rescuable exceptions which are defined in rescue_from/re…

…try_on/discard_on. Update activejob/CHANGELOG.md Co-authored-by: Rafael França <[email protected]>
shunyama · Dec 31, 2020 · 0c6f32a · 0c6f32a
1 parent c02d9e5
commit 0c6f32a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/activejob/CHANGELOG.md b/activejob/CHANGELOG.md
@@ -1,4 +1,6 @@
+*   Skip logging rescuable exceptions which are defined in rescue_from/retry_on/discard_on.
 
+    *Hu Hailin*
 
 
 Please check [6-1-stable](https://github.com/rails/rails/blob/6-1-stable/activejob/CHANGELOG.md) for previous changes.
diff --git a/activejob/lib/active_job/log_subscriber.rb b/activejob/lib/active_job/log_subscriber.rb
@@ -54,8 +54,10 @@ def perform(event)
       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")
+        unless job.class.rescue_handlers.any? { |handler| handler[0] == event.payload[:exception][0] }
+          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
         end
       elsif event.payload[:aborted]
         error do