wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #17953 from nextcloud/backport/17942/stable16

Browse source 
[stable16] pass through ServerNotAvailableException on app init
This commit is contained in:
Roeland Jago Douma 2019-11-17 09:09:12 +01:00 committed by GitHub
commit 54cdbea127
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\Installer;
use OC\Repair;
use OC\ServerNotAvailableException;
use OCP\App\ManagerEvent;
use OCP\ILogger;
@ -153,6 +154,9 @@ class OC_App {
try {
self::requireAppFile($app);
} catch (Throwable $ex) {
if($ex instanceof ServerNotAvailableException) {
throw $ex;
}
\OC::$server->getLogger()->logException($ex);
if (!\OC::$server->getAppManager()->isShipped($app)) {
// Only disable apps which are not shipped