wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move all upgrade routines into the command-line tool.

Browse source
This commit is contained in:
ringmaster 2013-10-28 10:15:56 -04:00
parent 29a21466f3
commit a24cbb50af
2 changed files with 55 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
core/command/upgrade.php
View file

@ -8,6 +8,7 @@
namespace OC\Core\Command; namespace OC\Core\Command;
use OC\Updater;
use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
@ -23,6 +24,59 @@ class Upgrade extends Command {
} }
protected function execute(InputInterface $input, OutputInterface $output) { protected function execute(InputInterface $input, OutputInterface $output) {
include \OC::$SERVERROOT . '/upgrade.php'; global $RUNTIME_NOAPPS;
$RUNTIME_NOAPPS = true; //no apps, yet
require_once \OC::$SERVERROOT . '/lib/base.php';
// Don't do anything if ownCloud has not been installed
if(!\OC_Config::getValue('installed', false)) {
echo 'ownCloud has not yet been installed' . PHP_EOL;
exit(0);
}
if(\OC::checkUpgrade(false)) {
$updater = new Updater();
$updater->listen('\OC\Updater', 'maintenanceStart', function () {
echo 'Turned on maintenance mode' . PHP_EOL;
});
$updater->listen('\OC\Updater', 'maintenanceEnd', function () {
echo 'Turned off maintenance mode' . PHP_EOL;
echo 'Update successful' . PHP_EOL;
});
$updater->listen('\OC\Updater', 'dbUpgrade', function () {
echo 'Updated database' . PHP_EOL;
});
$updater->listen('\OC\Updater', 'filecacheStart', function () {
echo 'Updating filecache, this may take really long...' . PHP_EOL;
});
$updater->listen('\OC\Updater', 'filecacheDone', function () {
echo 'Updated filecache' . PHP_EOL;
});
$updater->listen('\OC\Updater', 'filecacheProgress', function ($out) {
echo '... ' . $out . '% done ...' . PHP_EOL;
});
$updater->listen('\OC\Updater', 'failure', function ($message) {
echo $message . PHP_EOL;
\OC_Config::setValue('maintenance', false);
});
$updater->upgrade();
} else {
if(\OC_Config::getValue('maintenance', false)) {
//Possible scenario: ownCloud core is updated but an app failed
echo 'ownCloud is in maintenance mode' . PHP_EOL;
echo 'Maybe an upgrade is already in process. Please check the '
. 'logfile (data/owncloud.log). If you want to re-run the '
. 'upgrade procedure, remove the "maintenance mode" from '
. 'config.php and call this script again.'
. PHP_EOL;
} else {
echo 'ownCloud is already latest version' . PHP_EOL;
}
}
} }
} }

77
upgrade.php
View file

@ -1,77 +0,0 @@
<?php
/**
* ownCloud
*
* @author Arthur Schiwon
* @copyright 2013 Arthur Schiwon blizzz@owncloud.com
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
* License as published by the Free Software Foundation; either
* version 3 of the License, or any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
*
* You should have received a copy of the GNU Affero General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*
*/
$RUNTIME_NOAPPS = true; //no apps, yet
require_once 'lib/base.php';
// Don't do anything if ownCloud has not been installed
if(!OC_Config::getValue('installed', false)) {
exit(0);
}
$br = OC::$CLI ? PHP_EOL : '<br/>';
if(OC::checkUpgrade(false)) {
$updater = new \OC\Updater();
$updater->listen('\OC\Updater', 'maintenanceStart', function () use ($br) {
echo 'Turned on maintenance mode'.$br;
});
$updater->listen('\OC\Updater', 'maintenanceEnd', function () use ($br) {
echo 'Turned off maintenance mode'.$br;
echo 'Update successful'.$br;
});
$updater->listen('\OC\Updater', 'dbUpgrade', function () use ($br) {
echo 'Updated database'.$br;
});
$updater->listen('\OC\Updater', 'filecacheStart', function () use ($br) {
echo 'Updating filecache, this may take really long...'.$br;
});
$updater->listen('\OC\Updater', 'filecacheDone', function () use ($br) {
echo 'Updated filecache'.$br;
});
$updater->listen('\OC\Updater', 'filecacheProgress', function ($out)
use ($br) {
echo '... ' . $out . '% done ...'.$br;
});
$updater->listen('\OC\Updater', 'failure', function ($message) use ($br) {
echo $message.$br;
OC_Config::setValue('maintenance', false);
});
$updater->upgrade();
} else {
if(OC_Config::getValue('maintenance', false)) {
//Possible scenario: ownCloud core is updated but an app failed
echo 'ownCloud is in maintenance mode'.$br;
echo 'Maybe an upgrade is already in process. Please check the '
. 'logfile (data/owncloud.log). If you want to re-run the '
. 'upgrade procedure, remove the "maintenance mode" from '
. 'config.php and call this script again.'
.$br;
} else {
echo 'ownCloud is already latest version'.$br;
}
}