diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-06-23 10:22:24 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-06-24 10:25:05 +0200 |
| commit | 5ff536b45ad6f9c4490a9d949353c6aeea26d7f1 (patch) | |
| tree | 0d78e539d4abfd534cb23773fea76a9328c43c47 | |
| parent | ceb80ac123b26b033aac3f724da44a6f78c539ec (diff) | |
| download | nextcloud-server-5ff536b45ad6f9c4490a9d949353c6aeea26d7f1.tar.gz nextcloud-server-5ff536b45ad6f9c4490a9d949353c6aeea26d7f1.zip | |
[upgrade] add verbosity check and show repair info & steps
| -rw-r--r-- | core/command/upgrade.php | 9 | ||||
| -rw-r--r-- | lib/private/updater.php | 6 |
2 files changed, 15 insertions, 0 deletions
diff --git a/core/command/upgrade.php b/core/command/upgrade.php index cf376148a00..c4f724d7e0a 100644 --- a/core/command/upgrade.php +++ b/core/command/upgrade.php @@ -168,6 +168,15 @@ class Upgrade extends Command { $output->writeln("<error>$message</error>"); }); + if(OutputInterface::VERBOSITY_NORMAL < $output->getVerbosity()) { + $updater->listen('\OC\Updater', 'repairInfo', function ($message) use($output) { + $output->writeln('<info>Repair info: ' . $message . '</info>'); + }); + $updater->listen('\OC\Updater', 'repairStep', function ($message) use($output) { + $output->writeln('<info>Repair step: ' . $message . '</info>'); + }); + } + $success = $updater->upgrade(); $this->postUpgradeCheck($input, $output); diff --git a/lib/private/updater.php b/lib/private/updater.php index 00c6569a52f..b011cf147e3 100644 --- a/lib/private/updater.php +++ b/lib/private/updater.php @@ -238,6 +238,12 @@ class Updater extends BasicEmitter { $repair->listen('\OC\Repair', 'error', function ($description) { $this->emit('\OC\Updater', 'repairError', array($description)); }); + $repair->listen('\OC\Repair', 'info', function ($description) { + $this->emit('\OC\Updater', 'repairInfo', array($description)); + }); + $repair->listen('\OC\Repair', 'step', function ($description) { + $this->emit('\OC\Updater', 'repairStep', array($description)); + }); } /** |