Merge pull request #24 from netlogix/feat/break-poll-loop-even-if-there-are-remaining-jobs

feat: Ensure poll loop breaks periodically even with active jobs

Author: paxuclus

Classes/Command/SchedulerCommandController.php

@@ -22,6 +22,10 @@
  */
 class SchedulerCommandController extends CommandController
 {
+    private const TEN_MINUTES_IN_SECONDS = 600;
+
+    protected $stopPollingAfter = self::TEN_MINUTES_IN_SECONDS;
+
     /**
      * @var Scheduler
      */
@@ -77,11 +81,10 @@ public function queueDueJobsCommand(string $groupName): void
     public function pollForIncomingJobsCommand(string $groupName): void
     {
         $startTime = time();
-        $oneHourInSeconds = 3600;
-        $endTime = $startTime + $oneHourInSeconds;
+        $endTime = $startTime + $this->stopPollingAfter;
 
         while (true) {
-            $numberOfHandledJobs = $this->queueDueJobs($groupName);
+            $numberOfHandledJobs = $this->queueDueJobs($groupName, $endTime);
             if (time() >= $endTime) {
                 return;
             }
@@ -92,9 +95,12 @@ public function pollForIncomingJobsCommand(string $groupName): void
     }
 
     /**
+     * @param string $groupName Handle only jobs of this group
+     * @param int $endTime Stop handling new jobs once this time is reached
      * @return int Number of handled jobs
+     * @throws ConnectionLost
      */
-    protected function queueDueJobs(string $groupName): int
+    protected function queueDueJobs(string $groupName, int $endTime): int
     {
         $numberOfHandledJobs = 0;
         $retry = new Retry($this->scheduler);
@@ -116,6 +122,9 @@ protected function queueDueJobs(string $groupName): int
                 $this->throwableStorage->logThrowable($throwable);
                 $retry->markJobForRescheduling($next);
             }
+            if (time() >= $endTime) {
+                return $numberOfHandledJobs;
+            }
         }
 
         $retry->scheduleAll();