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 15:23:40 +0100
commitf5a1f4bc1b6338804106e4beac6af5ab2732a947 (patch)
tree0a9ef3f67aa5299ed97858acecb6ff1a7e0486f5 /core/ajax
parentbfab6ccf1bcce9e778721e7e9e63cc8b315db298 (diff)
downloadnextcloud-server-f5a1f4bc1b6338804106e4beac6af5ab2732a947.tar.gz
nextcloud-server-f5a1f4bc1b6338804106e4beac6af5ab2732a947.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 6def2c6797b..7dead22b9dd 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'));
});