diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-13 11:04:02 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-10-13 11:04:02 +0200 |
| commit | 3891cd9068596481cf1717e9b1a5bcae1cc0ce09 (patch) | |
| tree | 06b3d0a75436bddbc87a2c85bbfa2c308ac181f5 /lib | |
| parent | 1cb4f1080a57bfffe5d71d7496b61184434ff84d (diff) | |
| parent | 4cb5970947f915c801a6748ad26898831ed3b4c1 (diff) | |
| download | nextcloud-server-3891cd9068596481cf1717e9b1a5bcae1cc0ce09.tar.gz nextcloud-server-3891cd9068596481cf1717e9b1a5bcae1cc0ce09.zip | |
Merge pull request #19677 from owncloud/silently-fail-app-upgrade-exceptions-master
Silently fail app upgrade exceptions
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/templatelayout.php | 2 | ||||
| -rw-r--r-- | lib/private/updater.php | 20 |
2 files changed, 12 insertions, 10 deletions
diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php index 43c83dea815..7d16823d2a8 100644 --- a/lib/private/templatelayout.php +++ b/lib/private/templatelayout.php @@ -79,7 +79,7 @@ class OC_TemplateLayout extends OC_Template { if($this->config->getSystemValue('updatechecker', true) === true && OC_User::isAdminUser(OC_User::getUser())) { $updater = new \OC\Updater(\OC::$server->getHTTPHelper(), - \OC::$server->getConfig()); + \OC::$server->getConfig(), \OC::$server->getLogger()); $data = $updater->check(); if(isset($data['version']) && $data['version'] != '' and $data['version'] !== Array()) { diff --git a/lib/private/updater.php b/lib/private/updater.php index 8aa8b0703d7..70d68863788 100644 --- a/lib/private/updater.php +++ b/lib/private/updater.php @@ -32,7 +32,6 @@ namespace OC; -use OC\Core\Command\Log\Manage; use OC\Hooks\BasicEmitter; use OC_App; use OC_Installer; @@ -199,15 +198,13 @@ class Updater extends BasicEmitter { $installedVersion = $this->config->getSystemValue('version', '0.0.0'); $currentVersion = implode('.', \OC_Util::getVersion()); - if ($this->log) { - $this->log->debug('starting upgrade from ' . $installedVersion . ' to ' . $currentVersion, array('app' => 'core')); - } + $this->log->debug('starting upgrade from ' . $installedVersion . ' to ' . $currentVersion, array('app' => 'core')); $success = true; try { $this->doUpgrade($currentVersion, $installedVersion); } catch (\Exception $exception) { - \OCP\Util::logException('update', $exception); + $this->log->logException($exception, ['app' => 'core']); $this->emit('\OC\Updater', 'failure', array(get_class($exception) . ': ' .$exception->getMessage())); $success = false; } @@ -235,6 +232,7 @@ class Updater extends BasicEmitter { private function getAllowedPreviousVersion() { // this should really be a JSON file require \OC::$SERVERROOT . '/version.php'; + /** @var array $OC_VersionCanBeUpgradedFrom */ return implode('.', $OC_VersionCanBeUpgradedFrom); } @@ -497,11 +495,15 @@ class Updater extends BasicEmitter { */ private function upgradeAppStoreApps(array $disabledApps) { foreach($disabledApps as $app) { - if (OC_Installer::isUpdateAvailable($app)) { - $ocsId = \OC::$server->getConfig()->getAppValue($app, 'ocsid', ''); + try { + if (OC_Installer::isUpdateAvailable($app)) { + $ocsId = \OC::$server->getConfig()->getAppValue($app, 'ocsid', ''); - $this->emit('\OC\Updater', 'upgradeAppStoreApp', array($app)); - OC_Installer::updateAppByOCSId($ocsId); + $this->emit('\OC\Updater', 'upgradeAppStoreApp', array($app)); + OC_Installer::updateAppByOCSId($ocsId); + } + } catch (\Exception $ex) { + $this->log->logException($ex, ['app' => 'core']); } } } |