Merge pull request #16 from aloware/add-queue-tries

Feature | Add Queue Tries
aloware · May 13, 2022 · b9d41ec · b9d41ec
2 parents 6c42245 + 5f5a4ca
commit b9d41ec
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 1 deletion.
diff --git a/config/fair-queue.php b/config/fair-queue.php
@@ -22,6 +22,19 @@
     */
     'middleware' => ['web'],
 
+    /*
+    |--------------------------------------------------------------------------
+    | FairQueue Queue Tries
+    |--------------------------------------------------------------------------
+    |
+    | After a jobs how many times it should requeue? You can specify the
+    | number of tries here.
+    |
+    */
+    'queues' => [
+        'default' => ['tries' => 3],
+    ],
+
     /*
     |--------------------------------------------------------------------------
     | FairQueue Redis DB

diff --git a/src/FairSignalJob.php b/src/FairSignalJob.php
@@ -76,7 +76,11 @@ public function handle()
 
             $jobSerialized = serialize($job);
 
-            $maxTries = $job->maxTries ?? 1;
+            $maxTries = $job->maxTries ?? false;
+
+            if(!$maxTries) {
+                $maxTries = $this->getQueueTries($this->queue) ?? 1;
+            }
 
             if ($job->tries >= $maxTries) {
                 $repository->pushFailed($this->queue, $partition, $jobSerialized);
@@ -93,6 +97,23 @@ public function handle()
         }
     }
 
+    public function getQueueTries($queue)
+    {
+        if(!$queue) {
+            $queue = 'default';
+        }
+
+        // get queue tries from fair-queue config
+        $tries = config("fair-queue.queues.{$queue}.tries");
+
+        // sanity check
+        if(!$tries) {
+            $tries = config('fair-queue.queues.default.tries');
+        }
+
+        return $tries;
+    }
+
     public function addToPartition()
     {
         /** @var RepositoryInterface $repository */