Skip to content

Implement catch-up behavior for cron jobs #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
intersel wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Implement catch-up behavior for cron jobs #67

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions core/components/cronmanager/processors/web/cron/run.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,30 @@ private function runCronjobs($success)
}
$c->sortby('nextrun');

// Get catch-up behavior option (default: enabled for backward compatibility)
// 1 = enable catch-up (original behavior)
// 0 = disable catch-up (reschedule from current time)
$catchup = (int)$this->cronmanager->getOption('cron_enable_catchup', null, 0);

/** @var modCronjob $cronjob */
$cronjobs = $this->modx->getIterator('modCronjob', $c);
foreach ($cronjobs as $cronjob) {
// Determine initial base datetime for scheduling
$rundatetime = ($cronjob->get('nextrun')) ? $cronjob->get('nextrun') : date('Y-m-d H:i:s');

if (!$catchup) {
// Catch-up disabled:
// Always reschedule based on the current time to avoid executing missed runs
$rundatetime = date('Y-m-d H:i:s');
} else {
// Catch-up enabled:
// If nextrun is significantly in the past, reset to current time
// This prevents excessive back-to-back executions ("catch-up loops")
if (strtotime($rundatetime) < time() - 60) {
$rundatetime = date('Y-m-d H:i:s');
}
}

$properties = $cronjob->get('properties');
if (!empty($properties)) {
/** @var modPropertySet $propset */
Expand Down Expand Up @@ -140,9 +160,9 @@ private function runCronjobs($success)
$logs = [$log];

$cronjob->set('lastrun', $rundatetime);
if ($this->cronmanager->getOption('daylight_saving') && $cronjob->get('minutes') > 60) {
if ($this->cronmanager->getOption('daylight_saving') && $cronjob->get('minutes') > 60) {
$cronjob->set('nextrun', date('Y-m-d H:i:s', strtotime($cronjob->get('minutes') . ' minutes', (strtotime($rundatetime)))));
} else {
} else {
$cronjob->set('nextrun', date('Y-m-d H:i:s', (strtotime($rundatetime) + ($cronjob->get('minutes') * 60))));
}
$cronjob->set('running', false);
Expand Down