diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2015-07-01 08:56:06 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2015-07-01 08:56:06 +0200 |
| commit | b5c9196ffcf8f5300d96e7d2bdd78f2695f6fd7a (patch) | |
| tree | 77757451dd9014c41c7cfb3339336569ccf7e677 /lib | |
| parent | 4e44cc49d905171374768a29f5af826092915b8c (diff) | |
| parent | 17ff77c4e7982f40aaaa99e2c8fe7662e85d79a5 (diff) | |
| download | nextcloud-server-b5c9196ffcf8f5300d96e7d2bdd78f2695f6fd7a.tar.gz nextcloud-server-b5c9196ffcf8f5300d96e7d2bdd78f2695f6fd7a.zip | |
Merge pull request #17088 from owncloud/add-verbosity-to-upgrade
[upgrade] add verbosity check and show repair info & steps
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/updater.php | 6 | ||||
| -rw-r--r-- | lib/repair/collation.php | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/lib/private/updater.php b/lib/private/updater.php index fa9c1a5176a..cba87434165 100644 --- a/lib/private/updater.php +++ b/lib/private/updater.php @@ -239,6 +239,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)); + }); } /** diff --git a/lib/repair/collation.php b/lib/repair/collation.php index e28ee3ab114..7eb14f0ded2 100644 --- a/lib/repair/collation.php +++ b/lib/repair/collation.php @@ -60,6 +60,7 @@ class Collation extends BasicEmitter implements \OC\RepairStep { $tables = $this->getAllNonUTF8BinTables($this->connection); foreach ($tables as $table) { + $this->emit('\OC\Repair', 'info', array("Change collation for $table ...")); $query = $this->connection->prepare('ALTER TABLE `' . $table . '` CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin;'); $query->execute(); } |