Merge pull request #24145 from owncloud/limit-cron-execution-time

Make sure that CLI cron doesn't run for ever, but makes use of the ne…

1 files changed, 8 insertions, 0 deletions

diff --git a/cron.php b/cron.php
index f0dde4fea7f..c4bc9e9667c 100644
--- a/cron.php
+++ b/cron.php
@@ -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