Skip to content

Stop cron after update #5172

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

Closed
nickvergessen wants to merge 2 commits into from
Closed

Stop cron after update #5172

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b6f88b
Fix code style
nickvergessen May 30, 2017
9b860d6
Stop the cron execution when the version changed or maintenance is ac…
nickvergessen May 30, 2017
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
11 changes: 8 additions & 3 deletions cron.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@
// We only ask for jobs for 14 minutes, because after 15 minutes the next
// system cron task should spawn.
$endTime = time() + 14 * 60;
$currentVersion = $config->getSystemValue('version', '');

$executedJobs = [];
while ($job = $jobList->getNext()) {
Expand All @@ -128,14 +129,18 @@
$executedJobs[$job->getId()] = true;
unset($job);

if (time() > $endTime) {
if (time() > $endTime ||
$config->getSystemValue('maintenance', false) ||
$currentVersion !== $config->getSystemValue('version', '')
Copy link
Member

@MorrisJobke MorrisJobke Aug 9, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm pretty sure, that this will not work, because the config is already loaded and will still hold the old version.

) {
// Time over or there is/was an update, make sure we don't continue with old cached data...
break;
}
}

} else {
// We call cron.php from some website
if ($appMode == 'cron') {
if ($appMode === 'cron') {
// Cron is cron :-P
OC_JSON::error(array('data' => array('message' => 'Backgroundjobs are using system cron!')));
} else {
Expand All @@ -151,7 +156,7 @@
}

// Log the successful cron execution
\OC::$server->getConfig()->setAppValue('core', 'lastcron', time());
$config->setAppValue('core', 'lastcron', time());
exit();

} catch (Exception $ex) {
Expand Down