mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Disables the maintenance warning for the maintenance command itself. 

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
This commit is contained in:
Michael Weimann 2018-07-01 20:54:19 +02:00
parent a014129804
commit 03a5856541
1 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lib/private/Console/Application.php
View File

@ -39,6 +39,7 @@ use OCP\IRequest;
use Symfony\Component\Console\Application as SymfonyApplication; use Symfony\Component\Console\Application as SymfonyApplication;
use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\ConsoleOutputInterface;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@ -69,10 +70,13 @@ class Application {
/** /**
* @param InputInterface $input * @param InputInterface $input
* @param OutputInterface $output * @param ConsoleOutputInterface $output
* @throws \Exception * @throws \Exception
*/ */
public function loadCommands(InputInterface $input, OutputInterface $output) { public function loadCommands(
InputInterface $input,
ConsoleOutputInterface $output
) {
// $application is required to be defined in the register_command scripts // $application is required to be defined in the register_command scripts
$application = $this->application; $application = $this->application;
$inputDefinition = $application->getDefinition(); $inputDefinition = $application->getDefinition();
@ -99,10 +103,7 @@ class Application {
if (\OCP\Util::needUpgrade()) { if (\OCP\Util::needUpgrade()) {
throw new NeedsUpdateException(); throw new NeedsUpdateException();
} elseif ($this->config->getSystemValue('maintenance', false)) { } elseif ($this->config->getSystemValue('maintenance', false)) {
if ($input->getArgument('command') !== '_completion') { $this->writeMaintenanceModeInfo($input, $output);
$errOutput = $output->getErrorOutput();
$errOutput->writeln('<comment>Nextcloud is in maintenance mode - no apps have been loaded</comment>' . PHP_EOL);
}
} else { } else {
OC_App::loadApps(); OC_App::loadApps();
foreach (\OC::$server->getAppManager()->getInstalledApps() as $app) { foreach (\OC::$server->getAppManager()->getInstalledApps() as $app) {
@ -150,6 +151,28 @@ class Application {
} }
} }
/**
* Write a maintenance mode info.
* The commands "_completion" and "maintenance:mode" are excluded.
*
* @param InputInterface $input The input implementation for reading inputs.
* @param ConsoleOutputInterface $output The output implementation
* for writing outputs.
* @return void
*/
private function writeMaintenanceModeInfo(
InputInterface $input, ConsoleOutputInterface $output
) {
if ($input->getArgument('command') !== '_completion'
&& $input->getArgument('command') !== 'maintenance:mode') {
$errOutput = $output->getErrorOutput();
$errOutput->writeln(
'<comment>Nextcloud is in maintenance mode - ' .
'no apps have been loaded</comment>' . PHP_EOL
);
}
}
/** /**
* Sets whether to automatically exit after a command execution or not. * Sets whether to automatically exit after a command execution or not.
* *