diff --git a/app/models/solid_queue/claimed_execution.rb b/app/models/solid_queue/claimed_execution.rb index d22d8171..ba469a3e 100644 --- a/app/models/solid_queue/claimed_execution.rb +++ b/app/models/solid_queue/claimed_execution.rb @@ -36,7 +36,7 @@ def release_all end end - def fail_all_with(error, reraise: true) + def fail_all_with(error, reraise:) SolidQueue.instrument(:fail_many_claimed) do |payload| includes(:job).tap do |executions| executions.each { |execution| execution.failed_with(error, reraise: reraise) } @@ -63,7 +63,7 @@ def perform if result.success? finished else - failed_with(result.error) + failed_with(result.error, reraise: true) end ensure job.unblock_next_blocked_job @@ -82,7 +82,7 @@ def discard raise UndiscardableError, "Can't discard a job in progress" end - def failed_with(error, reraise: true) + def failed_with(error, reraise:) transaction do job.failed_with(error) destroy! diff --git a/app/models/solid_queue/process/executor.rb b/app/models/solid_queue/process/executor.rb index 015603cf..23c41911 100644 --- a/app/models/solid_queue/process/executor.rb +++ b/app/models/solid_queue/process/executor.rb @@ -11,7 +11,7 @@ module Executor after_destroy :release_all_claimed_executions end - def fail_all_claimed_executions_with(error, reraise: true) + def fail_all_claimed_executions_with(error, reraise:) if claims_executions? claimed_executions.fail_all_with(error, reraise: reraise) end