summaryrefslogtreecommitdiffstats
path: root/core/ajax
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-11-01 12:52:09 +0100
committerMorris Jobke <hey@morrisjobke.de>2018-11-01 22:09:45 +0100
commitb292f919c646f2cc3f10c220c5c72a5b132b6467 (patch)
treea954fb39987407776ec426c6937ec3e329d049aa /core/ajax
parent5bb7378bf326acacaf86dbf18fe367edaf44e2c4 (diff)
downloadnextcloud-server-b292f919c646f2cc3f10c220c5c72a5b132b6467.tar.gz
nextcloud-server-b292f919c646f2cc3f10c220c5c72a5b132b6467.zip
Revert "Wait for cron to finish before running upgrade command"
This reverts commit 18e9631810ad1d3d72c2b4bbee330169808108ad. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'core/ajax')
-rw-r--r--core/ajax/update.php6
1 files changed, 1 insertions, 5 deletions
diff --git a/core/ajax/update.php b/core/ajax/update.php
index 377da746100..6ec6b71731d 100644
--- a/core/ajax/update.php
+++ b/core/ajax/update.php
@@ -119,8 +119,7 @@ if (\OCP\Util::needUpgrade()) {
$config,
\OC::$server->getIntegrityCodeChecker(),
$logger,
- \OC::$server->query(\OC\Installer::class),
- \OC::$server->getJobList()
+ \OC::$server->query(\OC\Installer::class)
);
$incompatibleApps = [];
@@ -153,9 +152,6 @@ if (\OCP\Util::needUpgrade()) {
$updater->listen('\OC\Updater', 'maintenanceActive', function () use ($eventSource, $l) {
$eventSource->send('success', (string)$l->t('Maintenance mode is kept active'));
});
- $updater->listen('\OC\Updater', 'waitForCronToFinish', function () use ($eventSource, $l) {
- $eventSource->send('success', (string)$l->t('Waiting for cron to finish (checks again in 5 seconds) …'));
- });
$updater->listen('\OC\Updater', 'dbUpgradeBefore', function () use($eventSource, $l) {
$eventSource->send('success', (string)$l->t('Updating database schema'));
});