upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-15 22:11:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 27

Switch away from Server::get for AppManager and logger in loadApp

Browse source 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
This commit is contained in:
Côme Chilliet 2023-02-07 17:01:13 +01:00
parent a7c8090dc3
commit 71ed968e34
No known key found for this signature in database
GPG key ID: A3E2F658B28C760A
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/private/App/AppManager.php
View file

@ -338,12 +338,12 @@ class AppManager implements IAppManager {
$hasAppPhpFile = is_file($appPath . '/appinfo/app.php');
if ($isBootable && $hasAppPhpFile) {
\OC::$server->getLogger()->error('/appinfo/app.php is not loaded when \OCP\AppFramework\Bootstrap\IBootstrap on the application class is used. Migrate everything from app.php to the Application class.', [
$this->logger->error('/appinfo/app.php is not loaded when \OCP\AppFramework\Bootstrap\IBootstrap on the application class is used. Migrate everything from app.php to the Application class.', [
'app' => $app,
]);
} elseif ($hasAppPhpFile) {
$eventLogger->start("bootstrap:load_app:$app:app.php", "Load legacy app.php app $app");
\OC::$server->getLogger()->debug('/appinfo/app.php is deprecated, use \OCP\AppFramework\Bootstrap\IBootstrap on the application class instead.', [
$this->logger->debug('/appinfo/app.php is deprecated, use \OCP\AppFramework\Bootstrap\IBootstrap on the application class instead.', [
'app' => $app,
]);
try {
@ -352,16 +352,16 @@ class AppManager implements IAppManager {
if ($ex instanceof ServerNotAvailableException) {
throw $ex;
}
if (!\OC::$server->getAppManager()->isShipped($app) && !self::isType($app, ['authentication'])) {
\OC::$server->getLogger()->logException($ex, [
'message' => "App $app threw an error during app.php load and will be disabled: " . $ex->getMessage(),
if (!$this->isShipped($app) && !\OC_App::isType($app, ['authentication'])) {
$this->logger->error("App $app threw an error during app.php load and will be disabled: " . $ex->getMessage(), [
'exception' => $ex,
]);
// Only disable apps which are not shipped and that are not authentication apps
\OC::$server->getAppManager()->disableApp($app, true);
$this->disableApp($app, true);
} else {
\OC::$server->getLogger()->logException($ex, [
'message' => "App $app threw an error during app.php load: " . $ex->getMessage(),
$this->logger->error("App $app threw an error during app.php load: " . $ex->getMessage(), [
'exception' => $ex,
]);
}
}