upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-10 09:13:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

Merge pull request #50954 from nextcloud/backport/50942/stable31

Browse source 
[stable31] fix(cron): Ignore time sensitivity when a class was explicitely scheduled
This commit is contained in:
Joas Schilling 2025-02-25 14:05:30 +01:00 committed by GitHub
commit 63b9a48e69
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cron.php
View file

@ -32,6 +32,7 @@ Usage:
Arguments:
job-classes Optional job class list to only run those jobs
Providing a class will ignore the time-sensitivity restriction
Options:
-h, --help Display this help message
@ -112,10 +113,14 @@ Options:
$appConfig->setValueString('core', 'backgroundjobs_mode', 'cron');
}
// a specific job class list can optionally be given as argument
$jobClasses = array_slice($argv, $verbose ? 2 : 1);
$jobClasses = empty($jobClasses) ? null : $jobClasses;
// Low-load hours
$onlyTimeSensitive = false;
$startHour = $config->getSystemValueInt('maintenance_window_start', 100);
if ($startHour <= 23) {
if ($jobClasses === null && $startHour <= 23) {
$date = new \DateTime('now', new \DateTimeZone('UTC'));
$currentHour = (int)$date->format('G');
$endHour = $startHour + 4;
@ -143,9 +148,6 @@ Options:
$endTime = time() + 14 * 60;
$executedJobs = [];
// a specific job class list can optionally be given as argument
$jobClasses = array_slice($argv, $verbose ? 2 : 1);
$jobClasses = empty($jobClasses) ? null : $jobClasses;
while ($job = $jobList->getNext($onlyTimeSensitive, $jobClasses)) {
if (isset($executedJobs[$job->getId()])) {
@ -159,7 +161,7 @@ Options:
$timeBefore = time();
$memoryBefore = memory_get_usage();
$memoryPeakBefore = memory_get_peak_usage();
if ($verbose) {
echo 'Starting job ' . $jobDetails . PHP_EOL;
}