summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2015-06-18 16:49:20 +0200
committerMorris Jobke <hey@morrisjobke.de>2015-06-18 16:49:20 +0200
commitd48ab2b0513ce861df4212626b84b018849829d5 (patch)
treebae7f0fbea7b598bed29bb5fd6ace10296ac134b
parentf2b7eb85c8215566d5e1fb8012b6d860d547ddd5 (diff)
downloadnextcloud-server-d48ab2b0513ce861df4212626b84b018849829d5.tar.gz
nextcloud-server-d48ab2b0513ce861df4212626b84b018849829d5.zip
Proper repair step info during upgrade on cli
-rw-r--r--core/command/upgrade.php3
-rw-r--r--lib/repair/collation.php1
2 files changed, 4 insertions, 0 deletions
diff --git a/core/command/upgrade.php b/core/command/upgrade.php
index d037082c5e8..22f4293149f 100644
--- a/core/command/upgrade.php
+++ b/core/command/upgrade.php
@@ -101,6 +101,9 @@ class Upgrade extends Command {
$updater->listen('\OC\Updater', 'disabledApps', function ($appList) use($output) {
$output->writeln('<info>Disabled incompatible apps: ' . implode(', ', $appList) . '</info>');
});
+ $updater->listen('\OC\Repair', 'info', function ($message) use($output) {
+ $output->writeln('<info>Repair info: ' . $message . '</info>');
+ });
$updater->listen('\OC\Updater', 'failure', function ($message) use($output) {
$output->writeln($message);
diff --git a/lib/repair/collation.php b/lib/repair/collation.php
index 2247cf82d0a..315969b7313 100644
--- a/lib/repair/collation.php
+++ b/lib/repair/collation.php
@@ -48,6 +48,7 @@ class Collation extends BasicEmitter implements \OC\RepairStep {
foreach ($tables as $table) {
$query = $this->connection->prepare('ALTER TABLE `' . $table . '` CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;');
$query->execute();
+ $this->emit('\OC\Repair', 'info', array("Changed collation for $table"));
}
}