Skip to content

Commit 54cdbea

Browse files
authored
Merge pull request #17953 from nextcloud/backport/17942/stable16
[stable16] pass through ServerNotAvailableException on app init
2 parents 3273c51 + fbce2b7 commit 54cdbea

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

lib/private/legacy/app.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
use OC\DB\MigrationService;
5656
use OC\Installer;
5757
use OC\Repair;
58+
use OC\ServerNotAvailableException;
5859
use OCP\App\ManagerEvent;
5960
use OCP\ILogger;
6061

@@ -153,6 +154,9 @@ public static function loadApp(string $app) {
153154
try {
154155
self::requireAppFile($app);
155156
} catch (Throwable $ex) {
157+
if($ex instanceof ServerNotAvailableException) {
158+
throw $ex;
159+
}
156160
\OC::$server->getLogger()->logException($ex);
157161
if (!\OC::$server->getAppManager()->isShipped($app)) {
158162
// Only disable apps which are not shipped

0 commit comments

Comments
 (0)