From 0556fe351a89e2658eae9cc0d5b9ca212adb374b Mon Sep 17 00:00:00 2001 From: Christoph Wurst Date: Tue, 19 May 2020 10:48:57 +0200 Subject: [PATCH] Add a message to the log entry of an app being disabled As an admin, it's always a surprise to see that an app got disabled. On a busy server with many log entries, it's hard to locate the entry that explains why Nextcloud disabled an app. Adding a message will make it more obvious, allowing admins and developers to grep for the string. Signed-off-by: Christoph Wurst --- lib/private/legacy/OC_App.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/private/legacy/OC_App.php b/lib/private/legacy/OC_App.php index 2454d6be4f0..bfa894fa800 100644 --- a/lib/private/legacy/OC_App.php +++ b/lib/private/legacy/OC_App.php @@ -157,11 +157,17 @@ class OC_App { if ($ex instanceof ServerNotAvailableException) { throw $ex; } - \OC::$server->getLogger()->logException($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(), + ]); + // Only disable apps which are not shipped and that are not authentication apps \OC::$server->getAppManager()->disableApp($app, true); + } else { + \OC::$server->getLogger()->logException($ex, [ + 'message' => "App $app threw an error during app.php load: " . $ex->getMessage(), + ]); } } \OC::$server->getEventLogger()->end('load_app_' . $app); -- 2.39.5