Make sure we never lower the job next run (when rate limit is reached)

ConductionNL · Dec 19, 2024 · 5eaa439 · 5eaa439
1 parent 7bbb47d
commit 5eaa439
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/lib/Cron/ActionTask.php b/lib/Cron/ActionTask.php
@@ -137,10 +137,13 @@ public function run($argument)
 		if ($forceRun === false) {
 			$nextRun = new DateTime('now + ' . $job->getInterval() . ' seconds');
 			if (isset($result['nextRun']) === true) {
-				$nextRun = DateTime::createFromFormat('U', $result['nextRun'], $nextRun->getTimezone());
+				$nextRunRateLimit = DateTime::createFromFormat('U', $result['nextRun'], $nextRun->getTimezone());
 				// Check if the current seconds part is not zero, and if so, round up to the next minute
-				if ($nextRun->format('s') !== '00') {
-					$nextRun->modify('next minute');
+				if ($nextRunRateLimit->format('s') !== '00') {
+					$nextRunRateLimit->modify('next minute');
+				}
+				if ($nextRunRateLimit > $nextRun) {
+					$nextRun = $nextRunRateLimit;
 				}
 			}
 			$nextRun->setTime(hour: $nextRun->format('H'), minute: $nextRun->format('i'));