]> source.dussan.org Git - nextcloud-server.git/commitdiff
Add a message to the log entry of an app being disabled 21044/head
authorChristoph Wurst <christoph@winzerhof-wurst.at>
Tue, 19 May 2020 08:48:57 +0000 (10:48 +0200)
committerChristoph Wurst <christoph@winzerhof-wurst.at>
Tue, 19 May 2020 09:44:51 +0000 (11:44 +0200)
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 <christoph@winzerhof-wurst.at>
lib/private/legacy/OC_App.php

index 2454d6be4f0b3b271299c79002c873a719d8efd0..bfa894fa8007ae1a61b73f2eadcf16e5acc9e535 100644 (file)
@@ -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);