Merge pull request #26954 from nextcloud/backport/26879/stable20
[stable20] Don't break OCC if an app is breaking in it's Application class
This commit is contained in:
commit
da32428c3e
|
@ -105,22 +105,24 @@ class Coordinator {
|
|||
*/
|
||||
$appNameSpace = App::buildAppNamespace($appId);
|
||||
$applicationClassName = $appNameSpace . '\\AppInfo\\Application';
|
||||
if (class_exists($applicationClassName) && in_array(IBootstrap::class, class_implements($applicationClassName), true)) {
|
||||
try {
|
||||
/** @var IBootstrap|App $application */
|
||||
$apps[$appId] = $application = $this->serverContainer->query($applicationClassName);
|
||||
} catch (QueryException $e) {
|
||||
// Weird, but ok
|
||||
continue;
|
||||
}
|
||||
try {
|
||||
try {
|
||||
if (class_exists($applicationClassName) && in_array(IBootstrap::class, class_implements($applicationClassName), true)) {
|
||||
try {
|
||||
/** @var IBootstrap|App $application */
|
||||
$apps[$appId] = $application = $this->serverContainer->query($applicationClassName);
|
||||
} catch (QueryException $e) {
|
||||
// Weird, but ok
|
||||
continue;
|
||||
}
|
||||
$application->register($this->registrationContext->for($appId));
|
||||
} catch (Throwable $e) {
|
||||
$this->logger->logException($e, [
|
||||
'message' => 'Error during app service registration: ' . $e->getMessage(),
|
||||
'level' => ILogger::FATAL,
|
||||
]);
|
||||
}
|
||||
} catch (Throwable $e) {
|
||||
$this->logger->logException($e, [
|
||||
'message' => 'Error during app service registration: ' . $e->getMessage(),
|
||||
'level' => ILogger::FATAL,
|
||||
'app' => $appId,
|
||||
]);
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -128,7 +128,15 @@ class OC_App {
|
|||
ob_start();
|
||||
foreach ($apps as $app) {
|
||||
if (!isset(self::$loadedApps[$app]) && ($types === [] || self::isType($app, $types))) {
|
||||
self::loadApp($app);
|
||||
try {
|
||||
self::loadApp($app);
|
||||
} catch (\Throwable $e) {
|
||||
\OC::$server->getLogger()->logException($e, [
|
||||
'message' => 'Error during app loading: ' . $e->getMessage(),
|
||||
'level' => ILogger::FATAL,
|
||||
'app' => $app,
|
||||
]);
|
||||
}
|
||||
}
|
||||
}
|
||||
ob_end_clean();
|
||||
|
|
Loading…
Reference in New Issue