diff options
Diffstat (limited to 'console.php')
| -rw-r--r-- | console.php | 103 |
1 files changed, 55 insertions, 48 deletions
diff --git a/console.php b/console.php index f9a4689bd58..bdfe4b63254 100644 --- a/console.php +++ b/console.php @@ -1,46 +1,29 @@ <?php + +declare(strict_types=1); + +use OCP\IConfig; +use OCP\Server; + /** - * @copyright Copyright (c) 2016, ownCloud, Inc. - * - * @author Bart Visscher <bartv@thisnet.nl> - * @author Christoph Wurst <christoph@winzerhof-wurst.at> - * @author hoellen <dev@hoellen.eu> - * @author J0WI <J0WI@users.noreply.github.com> - * @author Joas Schilling <coding@schilljs.com> - * @author Ko- <k.stoffelen@cs.ru.nl> - * @author Lukas Reschke <lukas@statuscode.ch> - * @author Michael Weimann <mail@michael-weimann.eu> - * @author Morris Jobke <hey@morrisjobke.de> - * @author Patrick Paysant <patrick.paysant@linagora.com> - * @author Roeland Jago Douma <roeland@famdouma.nl> - * @author Thomas Müller <thomas.mueller@tmit.eu> - * @author Victor Dubiniuk <dubiniuk@owncloud.com> - * - * @license AGPL-3.0 - * - * This code is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License, version 3, - * as published by the Free Software Foundation. - * - * This program 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, version 3, - * along with this program. If not, see <http://www.gnu.org/licenses/> - * + * SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors + * SPDX-FileCopyrightText: 2016 ownCloud, Inc. + * SPDX-License-Identifier: AGPL-3.0-only */ require_once __DIR__ . '/lib/versioncheck.php'; use OC\Console\Application; +use OCP\AppFramework\Http\Response; +use OCP\Diagnostics\IEventLogger; +use OCP\IRequest; +use OCP\Profiler\IProfiler; use Symfony\Component\Console\Input\ArgvInput; use Symfony\Component\Console\Output\ConsoleOutput; define('OC_CONSOLE', 1); function exceptionHandler($exception) { - echo "An unhandled exception has been thrown:" . PHP_EOL; + echo 'An unhandled exception has been thrown:' . PHP_EOL; echo $exception; exit(1); } @@ -53,22 +36,24 @@ try { } if (!OC::$CLI) { - echo "This script can be run from the command line only" . PHP_EOL; + echo 'This script can be run from the command line only' . PHP_EOL; exit(1); } + $config = Server::get(IConfig::class); set_exception_handler('exceptionHandler'); if (!function_exists('posix_getuid')) { - echo "The posix extensions are required - see https://www.php.net/manual/en/book.posix.php" . PHP_EOL; + echo 'The posix extensions are required - see https://www.php.net/manual/en/book.posix.php' . PHP_EOL; exit(1); } + $user = posix_getuid(); $configUser = fileowner(OC::$configDir . 'config.php'); if ($user !== $configUser) { - echo "Console has to be executed with the user that owns the file config/config.php" . PHP_EOL; - echo "Current user id: " . $user . PHP_EOL; - echo "Owner id of config.php: " . $configUser . PHP_EOL; + echo 'Console has to be executed with the user that owns the file config/config.php' . PHP_EOL; + echo 'Current user id: ' . $user . PHP_EOL; + echo 'Owner id of config.php: ' . $configUser . PHP_EOL; echo "Try adding 'sudo -u #" . $configUser . "' to the beginning of the command (without the single quotes)" . PHP_EOL; echo "If running with 'docker exec' try adding the option '-u " . $configUser . "' to the docker command (without the single quotes)" . PHP_EOL; exit(1); @@ -76,28 +61,50 @@ try { $oldWorkingDir = getcwd(); if ($oldWorkingDir === false) { - echo "This script can be run from the Nextcloud root directory only." . PHP_EOL; + echo 'This script can be run from the Nextcloud root directory only.' . PHP_EOL; echo "Can't determine current working dir - the script will continue to work but be aware of the above fact." . PHP_EOL; } elseif ($oldWorkingDir !== __DIR__ && !chdir(__DIR__)) { - echo "This script can be run from the Nextcloud root directory only." . PHP_EOL; + echo 'This script can be run from the Nextcloud root directory only.' . PHP_EOL; echo "Can't change to Nextcloud root directory." . PHP_EOL; exit(1); } if (!(function_exists('pcntl_signal') && function_exists('pcntl_signal_dispatch')) && !in_array('--no-warnings', $argv)) { - echo "The process control (PCNTL) extensions are required in case you want to interrupt long running commands - see https://www.php.net/manual/en/book.pcntl.php" . PHP_EOL; + echo 'The process control (PCNTL) extensions are required in case you want to interrupt long running commands - see https://www.php.net/manual/en/book.pcntl.php' . PHP_EOL; echo "Additionally the function 'pcntl_signal' and 'pcntl_signal_dispatch' need to be enabled in your php.ini." . PHP_EOL; } - $application = new Application( - \OC::$server->getConfig(), - \OC::$server->getEventDispatcher(), - \OC::$server->getRequest(), - \OC::$server->get(\Psr\Log\LoggerInterface::class), - \OC::$server->query(\OC\MemoryInfo::class) - ); - $application->loadCommands(new ArgvInput(), new ConsoleOutput()); - $application->run(); + $eventLogger = Server::get(IEventLogger::class); + $eventLogger->start('console:build_application', 'Build Application instance and load commands'); + + $application = Server::get(Application::class); + /* base.php will have removed eventual debug options from argv in $_SERVER */ + $argv = $_SERVER['argv']; + $input = new ArgvInput($argv); + $application->loadCommands($input, new ConsoleOutput()); + + $eventLogger->end('console:build_application'); + $eventLogger->start('console:run', 'Run the command'); + + $application->setAutoExit(false); + $exitCode = $application->run($input); + + $eventLogger->end('console:run'); + + $profiler = Server::get(IProfiler::class); + if ($profiler->isEnabled()) { + $eventLogger->end('runtime'); + $profile = $profiler->collect(Server::get(IRequest::class), new Response()); + $profile->setMethod('occ'); + $profile->setUrl(implode(' ', $argv)); + $profiler->saveProfile($profile); + } + + if ($exitCode > 255) { + $exitCode = 255; + } + + exit($exitCode); } catch (Exception $ex) { exceptionHandler($ex); } catch (Error $ex) { |