fix: unify stale job timeout and expose as config setting

Author: HenrikVogel

Classes/Command/SchedulerCommandController.php

@@ -54,14 +54,11 @@ public function injectConnection(Connection $connection): void
      * Reset stale jobs that have not changed for too long.
      *
      * @param string $groupName Free jobs in this group only
-     * @param int $minutes Count jobs as stale if their last activity was more than these many minutes ago
-     * @throws Exception
      */
     public function resetStaleJobsCommand(
         string $groupName,
-        int $minutes = 10
     ): void {
-        $freed = $this->scheduler->resetStaleJobs($groupName, $minutes);
+        $freed = $this->scheduler->resetStaleJobs($groupName);
         if ($freed) {
             $this->outputLine('Freed ' . $freed . ' stale jobs.');
         }

Classes/Domain/AbstractScheduler.php

@@ -37,6 +37,9 @@ abstract class AbstractScheduler implements Scheduler
      */
     protected TimeBaseForDueDateCalculation $timeBaseForDueDateCalculation;
 
+    #[Flow\InjectConfiguration(path: 'staleJobTimeout')]
+    protected int $staleJobTimeoutSecs;
+
     protected const CLAIM_QUERY = "";
     protected const SELECT_QUERY = "";
     protected const RELEASE_QUERY = "";
@@ -280,16 +283,15 @@ public function activity(ScheduledJob $job): void
      * Reset stale jobs that have not changed for too long.
      *
      * @param string $groupName Free jobs in this group only
-     * @param int $minutes Count jobs as stale if their last activity was more than these many minutes ago
      * @throws Exception
      * @return int Number of freed jobs
      */
-    public function resetStaleJobs(string $groupName, int $minutes): int {
+    public function resetStaleJobs(string $groupName): int {
         return $this->dbal->executeQuery(
             sql: static::RESET_STALE_JOBS_QUERY,
             params: [
                 'groupName' => $groupName,
-                'minutes' => max($minutes, 1),
+                'seconds' => max($this->staleJobTimeoutSecs, 1),
             ],
             types: [
                 'groupName' => Types::STRING,

Classes/Domain/MySQLScheduler.php

@@ -118,7 +118,7 @@ class MySQLScheduler extends AbstractScheduler  {
         WHERE running = 1
           AND claimed NOT LIKE 'failed(%)'
           AND groupname = :groupName
-          AND activity < NOW() - INTERVAL :minutes MINUTE
+          AND activity < NOW() - INTERVAL :seconds SECOND
         MySQL;
 
 }

Classes/Domain/PostgreSQLScheduler.php

@@ -83,7 +83,7 @@ class PostgreSQLScheduler extends AbstractScheduler {
         WHERE running = 1
           AND claimed NOT LIKE 'failed(%)'
           AND groupname = :groupName
-          AND activity < NOW() - make_interval(mins => :minutes)
+          AND activity < NOW() - make_interval(secs => :seconds)
         PostgreSQL;
 
 }

Classes/Domain/Scheduler.php

@@ -23,7 +23,7 @@ public function fail(ScheduledJob $job, string $reason): void;
 
     public function activity(ScheduledJob $job): void;
 
-    public function resetStaleJobs(string $groupName, int $minutes): int;
+    public function resetStaleJobs(string $groupName): int;
 
     public function getConnection(): Connection;
 }

Configuration/Settings.Timeout.yaml

@@ -0,0 +1,8 @@
+Netlogix:
+  JobQueue:
+    Scheduled:
+
+      # Time (in seconds) of inactivity (no updates to the jobs activity timestamp column) after which a job
+      # is considered stale and needs to be reset (see SchedulerCommandController::resetStaleJobsCommand)
+      # in order to be picked up again.
+      staleJobTimeout: 60