mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #17954 from nextcloud/backport/17942/stable15 

[stable15] pass through ServerNotAvailableException on app init
This commit is contained in:
Roeland Jago Douma 2019-11-17 09:09:24 +01:00 committed by GitHub
parent e99335f5be 700770c95e
commit ae00845ffc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/private/legacy/app.php
View File

@ -55,6 +55,7 @@ use OC\App\Platform;
use OC\DB\MigrationService; use OC\DB\MigrationService;
use OC\Installer; use OC\Installer;
use OC\Repair; use OC\Repair;
use OC\ServerNotAvailableException;
use OCP\App\ManagerEvent; use OCP\App\ManagerEvent;
use OCP\ILogger; use OCP\ILogger;
@ -153,6 +154,9 @@ class OC_App {
try { try {
self::requireAppFile($app); self::requireAppFile($app);
} catch (Throwable $ex) { } catch (Throwable $ex) {
if($ex instanceof ServerNotAvailableException) {
throw $ex;
}
\OC::$server->getLogger()->logException($ex); \OC::$server->getLogger()->logException($ex);
if (!\OC::$server->getAppManager()->isShipped($app)) { if (!\OC::$server->getAppManager()->isShipped($app)) {
// Only disable apps which are not shipped // Only disable apps which are not shipped