Merge pull request #151 from xav-developer/fix/stuck-tasks

butschster · web-flow · commit b2ef7890957f · 2025-06-26T12:05:10.000+04:00
Tasks were stuck in case of an error, the "release" method did not return them to the queue.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog][keepachangelog] and this project adher
 
 ### Fixed
 
+- Tasks were stuck in case of an error, the "release" method did not return them to the queue.
+- The "calculateBackoff" method incorrectly took the index "$job->attempts()"
 - The "withHeader" method of the "\Spiral\RoadRunner\Jobs\Task\WritableHeadersInterface" interface expects the type "string|iterable", "int" is passed
 
 ## v5.12.0
diff --git a/src/Queue/QueueWorker.php b/src/Queue/QueueWorker.php
@@ -187,8 +187,7 @@ protected function failJob(RoadRunnerJob $job, \Throwable $e): void
     protected function maxAttemptsExceededException(RoadRunnerJob $job): MaxAttemptsExceededException
     {
         return new MaxAttemptsExceededException(
-            $job->resolveName(
-            ) . ' has been attempted too many times or run too long. The job may have previously timed out.',
+            $job->resolveName() . ' has been attempted too many times or run too long. The job may have previously timed out.',
         );
     }
 
@@ -267,9 +266,9 @@ protected function calculateBackoff(RoadRunnerJob $job, WorkerOptions $options):
             ',',
             \method_exists($job, 'backoff') && !\is_null($job->backoff())
                 ? $job->backoff()
-                : $options->backoff,
+                : (string) $options->backoff,
         );
 
-        return (int) ($backoff[$job->attempts() - 1] ?? last($backoff));
+        return (int) ($backoff[$job->attempts()] ?? last($backoff));
     }
 }
diff --git a/src/Queue/RoadRunnerJob.php b/src/Queue/RoadRunnerJob.php
@@ -48,6 +48,18 @@ public function fire(): void
         $this->task->complete();
     }
 
+    public function release($delay = 0): void
+    {
+        $attempts = $this->attempts();
+
+        $this->task
+            ->withDelay($delay)
+            ->withHeader('attempts', (string) ++$attempts)
+            ->requeue('release');
+
+        parent::release($delay);
+    }
+
     protected function failed($e): void
     {
         $attempts = $this->attempts();

Original file line number	Diff line number	Diff line change
`@@ -187,8 +187,7 @@ protected function failJob(RoadRunnerJob $job, \Throwable $e): void`
`187`	`187`	`protected function maxAttemptsExceededException(RoadRunnerJob $job): MaxAttemptsExceededException`
`188`	`188`	`{`
`189`	`189`	`return new MaxAttemptsExceededException(`
`190`		`- $job->resolveName(`
`191`		`- ) . ' has been attempted too many times or run too long. The job may have previously timed out.',`
	`190`	`+ $job->resolveName() . ' has been attempted too many times or run too long. The job may have previously timed out.',`
`192`	`191`	`);`
`193`	`192`	`}`
`194`	`193`
`@@ -267,9 +266,9 @@ protected function calculateBackoff(RoadRunnerJob $job, WorkerOptions $options):`
`267`	`266`	`',',`
`268`	`267`	`\method_exists($job, 'backoff') && !\is_null($job->backoff())`
`269`	`268`	`? $job->backoff()`
`270`		`- : $options->backoff,`
	`269`	`+ : (string) $options->backoff,`
`271`	`270`	`);`
`272`	`271`
`273`		`- return (int) ($backoff[$job->attempts() - 1] ?? last($backoff));`
	`272`	`+ return (int) ($backoff[$job->attempts()] ?? last($backoff));`
`274`	`273`	`}`
`275`	`274`	`}`