upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 16:26:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge pull request #18574 from owncloud/update-eventsource-errors

Browse source 
Properly show update exception in web UI
This commit is contained in:
Robin McCorkell 2015-08-27 00:36:46 +01:00
commit d4fca49858
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
core/ajax/update.php
View file

@ -28,15 +28,19 @@
set_time_limit(0);
require_once '../../lib/base.php';
\OCP\JSON::callCheck();
$l = \OC::$server->getL10N('core');
$eventSource = \OC::$server->createEventSource();
// need to send an initial message to force-init the event source,
// which will then trigger its own CSRF check and produces its own CSRF error
// message
$eventSource->send('success', (string)$l->t('Preparing update'));
if (OC::checkUpgrade(false)) {
// if a user is currently logged in, their session must be ignored to
// avoid side effects
\OC_User::setIncognitoMode(true);
$l = new \OC_L10N('core');
$eventSource = \OC::$server->createEventSource();
$logger = \OC::$server->getLogger();
$updater = new \OC\Updater(
\OC::$server->getHTTPHelper(),
@ -85,7 +89,13 @@ if (OC::checkUpgrade(false)) {
OC_Config::setValue('maintenance', false);
});
$updater->upgrade();
try {
$updater->upgrade();
} catch (\Exception $e) {
$eventSource->send('failure', get_class($e) . ': ' . $e->getMessage());
$eventSource->close();
exit();
}
if (!empty($incompatibleApps)) {
$eventSource->send('notice',
@ -96,6 +106,10 @@ if (OC::checkUpgrade(false)) {
(string)$l->t('Following apps have been disabled: %s', implode(', ', $disabledThirdPartyApps)));
}
$eventSource->send('done', '');
$eventSource->close();
} else {
$eventSource->send('notice', (string)$l->t('Already up to date'));
}
$eventSource->send('done', '');
$eventSource->close();