aboutsummaryrefslogtreecommitdiffstats
path: root/core/command/upgrade.php
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2016-04-04 16:20:53 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2016-04-04 16:20:53 +0200
commit4b79fb10a28d9edbace8ec44dfb43861c5570a64 (patch)
treefdd3134fb2fb4d97bab250810969e7082afa0df3 /core/command/upgrade.php
parent1f7e02e4d4fa918d933b904abf12fca6fda2c526 (diff)
downloadnextcloud-server-4b79fb10a28d9edbace8ec44dfb43861c5570a64.tar.gz
nextcloud-server-4b79fb10a28d9edbace8ec44dfb43861c5570a64.zip
Fix verbose output of upgrade command - not progressbar in this case and the schema migration test has one progressbar now for all tables - before we had one progressbar for each table
Diffstat (limited to 'core/command/upgrade.php')
-rw-r--r--core/command/upgrade.php38
1 files changed, 22 insertions, 16 deletions
diff --git a/core/command/upgrade.php b/core/command/upgrade.php
index c2de699d862..cbb1f26f938 100644
--- a/core/command/upgrade.php
+++ b/core/command/upgrade.php
@@ -139,26 +139,32 @@ class Upgrade extends Command {
$updater->setSkip3rdPartyAppsDisable($skip3rdPartyAppsDisable);
$dispatcher = \OC::$server->getEventDispatcher();
$progress = new ProgressBar($output);
- $progress->setFormat("%message%\n %current%/%max% [%bar%] %percent:3s%%");
- $dispatcher->addListener('\OC\DB\Migrator::executeSql', function($event) use ($progress, $output) {
+ $progress->setFormat(" %message%\n %current%/%max% [%bar%] %percent:3s%%");
+ $listener = function($event) use ($progress, $output) {
if ($event instanceof GenericEvent) {
- if ($event[0] === 1) {
- $output->writeln('');
- $progress->start($event[1]);
- }
$message = $event->getSubject();
- if (strlen($message) > 30) {
- $message = substr($message, 0, 27) . '...';
- }
- $progress->setMessage($message);
- $progress->setProgress($event[0]);
- $progress->display();
- if ($event[0] === $event[1]) {
- $progress->finish();
- $output->writeln('');
+ if (OutputInterface::VERBOSITY_NORMAL < $output->getVerbosity()) {
+ $output->writeln(' Checking table ' . $message);
+ } else {
+ if (strlen($message) > 60) {
+ $message = substr($message, 0, 57) . '...';
+ }
+ $progress->setMessage($message);
+ if ($event[0] === 1) {
+ $output->writeln('');
+ $progress->start($event[1]);
+ }
+ $progress->setProgress($event[0]);
+ if ($event[0] === $event[1]) {
+ $progress->setMessage('Done');
+ $progress->finish();
+ $output->writeln('');
+ }
}
}
- });
+ };
+ $dispatcher->addListener('\OC\DB\Migrator::executeSql', $listener);
+ $dispatcher->addListener('\OC\DB\Migrator::checkTable', $listener);
$updater->listen('\OC\Updater', 'maintenanceEnabled', function () use($output) {
$output->writeln('<info>Turned on maintenance mode</info>');