dont die if the external storage backend doesn't exist
This commit is contained in:
parent
308aaf89cd
commit
90ff4641e7
1 changed files with 19 additions and 10 deletions
|
@ -221,17 +221,26 @@ abstract class StoragesService {
|
|||
$currentStorage->setMountPoint($relativeMountPath);
|
||||
}
|
||||
|
||||
$this->populateStorageConfigWithLegacyOptions(
|
||||
$currentStorage,
|
||||
$mountType,
|
||||
$applicable,
|
||||
$storageOptions
|
||||
);
|
||||
try {
|
||||
$this->populateStorageConfigWithLegacyOptions(
|
||||
$currentStorage,
|
||||
$mountType,
|
||||
$applicable,
|
||||
$storageOptions
|
||||
);
|
||||
|
||||
if ($hasId) {
|
||||
$storages[$configId] = $currentStorage;
|
||||
} else {
|
||||
$storagesWithConfigHash[$configId] = $currentStorage;
|
||||
if ($hasId) {
|
||||
$storages[$configId] = $currentStorage;
|
||||
} else {
|
||||
$storagesWithConfigHash[$configId] = $currentStorage;
|
||||
}
|
||||
} catch (\UnexpectedValueException $e) {
|
||||
// dont die if a storage backend doesn't exist
|
||||
\OCP\Util::writeLog(
|
||||
'files_external',
|
||||
'Could not load storage: "' . $e->getMessage() . '"',
|
||||
\OCP\Util::ERROR
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue