From 26dc9bc8ee8639b1ad393f4f3f4fa3e1a397b70e Mon Sep 17 00:00:00 2001
From: Steve S <steves@github.com>
Date: Wed, 29 Aug 2018 13:28:55 -0400
Subject: Add hooks to ActiveJob around retries and discards
---
activejob/lib/active_job/exceptions.rb | 32 +++++++++++++++++++++++++-------
1 file changed, 25 insertions(+), 7 deletions(-)
(limited to 'activejob/lib')
diff --git a/activejob/lib/active_job/exceptions.rb b/activejob/lib/active_job/exceptions.rb
index 1e57dbcb1c..594870c031 100644
--- a/activejob/lib/active_job/exceptions.rb
+++ b/activejob/lib/active_job/exceptions.rb
@@ -44,12 +44,22 @@ module ActiveJob
# end
def retry_on(*exceptions, wait: 3.seconds, attempts: 5, queue: nil, priority: nil)
rescue_from(*exceptions) do |error|
+ payload = {
+ job: self,
+ adapter: self.class.queue_adapter,
+ error: error,
+ }
+
if executions < attempts
- logger.error "Retrying #{self.class} in #{wait} seconds, due to a #{error.class}. The original exception was #{error.cause.inspect}."
- retry_job wait: determine_delay(wait), queue: queue, priority: priority
+ ActiveSupport::Notifications.instrument("enqueue_retry.active_job", payload) do
+ logger.error "Retrying #{self.class} in #{wait} seconds, due to a #{error.class}. The original exception was #{error.cause.inspect}."
+ retry_job wait: determine_delay(wait), queue: queue, priority: priority
+ end
else
if block_given?
- yield self, error
+ ActiveSupport::Notifications.instrument("retry_stopped.active_job", payload) do
+ yield self, error
+ end
else
logger.error "Stopped retrying #{self.class} due to a #{error.class}, which reoccurred on #{executions} attempts. The original exception was #{error.cause.inspect}."
raise error
@@ -78,10 +88,18 @@ module ActiveJob
# end
def discard_on(*exceptions)
rescue_from(*exceptions) do |error|
- if block_given?
- yield self, error
- else
- logger.error "Discarded #{self.class} due to a #{error.class}. The original exception was #{error.cause.inspect}."
+ payload = {
+ job: self,
+ adapter: self.class.queue_adapter,
+ error: error,
+ }
+
+ ActiveSupport::Notifications.instrument("discard.active_job", payload) do
+ if block_given?
+ yield self, error
+ else
+ logger.error "Discarded #{self.class} due to a #{error.class}. The original exception was #{error.cause.inspect}."
+ end
end
end
end
--
cgit v1.2.3