mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #24180 from owncloud/backport-24145-limit-background-job-runtime-9.0 

[9.0] Make sure that CLI cron doesn't run for ever, but makes use of the ne…
This commit is contained in:
Thomas Müller 2016-04-22 17:23:53 +02:00
parent d2b4bf7682 9dc1c6c41f
commit a6164472a3
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cron.php
View File

@ -131,6 +131,10 @@ try {
// Work
$jobList = \OC::$server->getJobList();
// We only ask for jobs for 14 minutes, because after 15 minutes the next
// system cron task should spawn.
$endTime = time() + 14 * 60;
$executedJobs = [];
while ($job = $jobList->getNext()) {
if (isset($executedJobs[$job->getId()])) {
@ -144,6 +148,10 @@ try {
$jobList->setLastJob($job);
$executedJobs[$job->getId()] = true;
unset($job);
if (time() > $endTime) {
break;
}
}
// unlock the file