diff options
| -rw-r--r-- | core/command/upgrade.php | 14 | ||||
| -rw-r--r-- | lib/private/updater.php | 9 |
2 files changed, 15 insertions, 8 deletions
diff --git a/core/command/upgrade.php b/core/command/upgrade.php index 2d6394fea85..6791d386b27 100644 --- a/core/command/upgrade.php +++ b/core/command/upgrade.php @@ -39,8 +39,7 @@ class Upgrade extends Command { const ERROR_MAINTENANCE_MODE = 2; const ERROR_UP_TO_DATE = 3; const ERROR_INVALID_ARGUMENTS = 4; - - public $upgradeFailed = false; + const ERROR_FAILURE = 5; /** * @var IConfig @@ -128,9 +127,9 @@ class Upgrade extends Command { $output->writeln('<info>Maintenance mode is kept active</info>'); }); $updater->listen('\OC\Updater', 'updateEnd', - function () use($output, $updateStepEnabled, $self) { + function ($success) use($output, $updateStepEnabled, $self) { $mode = $updateStepEnabled ? 'Update' : 'Update simulation'; - $status = $self->upgradeFailed ? 'failed' : 'successful'; + $status = $success ? 'successful' : 'failed' ; $message = "<info>$mode $status</info>"; $output->writeln($message); }); @@ -163,13 +162,16 @@ class Upgrade extends Command { }); $updater->listen('\OC\Updater', 'failure', function ($message) use($output, $self) { $output->writeln("<error>$message</error>"); - $self->upgradeFailed = true; }); - $updater->upgrade(); + $success = $updater->upgrade(); $this->postUpgradeCheck($input, $output); + if(!$success) { + return self::ERROR_FAILURE; + } + return self::ERROR_SUCCESS; } else if($this->config->getSystemValue('maintenance', false)) { //Possible scenario: ownCloud core is updated but an app failed diff --git a/lib/private/updater.php b/lib/private/updater.php index 7f1a493d2a0..1b17face2e0 100644 --- a/lib/private/updater.php +++ b/lib/private/updater.php @@ -189,13 +189,16 @@ class Updater extends BasicEmitter { $this->log->debug('starting upgrade from ' . $installedVersion . ' to ' . $currentVersion, array('app' => 'core')); } + $success = true; try { $this->doUpgrade($currentVersion, $installedVersion); } catch (\Exception $exception) { - $this->emit('\OC\Updater', 'failure', array($exception->getMessage())); + \OCP\Util::logException('update', $exception); + $this->emit('\OC\Updater', 'failure', array(get_class($exception) . ': ' .$exception->getMessage())); + $success = false; } - $this->emit('\OC\Updater', 'updateEnd'); + $this->emit('\OC\Updater', 'updateEnd', array($success)); if(!$wasMaintenanceModeEnabled) { $this->config->setSystemValue('maintenance', false); @@ -203,6 +206,8 @@ class Updater extends BasicEmitter { } else { $this->emit('\OC\Updater', 'maintenanceActive'); } + + return $success; } /** |