diff options
| author | Robin Appelman <robin@icewind.nl> | 2022-04-22 14:59:15 +0200 |
|---|---|---|
| committer | Robin Appelman <robin@icewind.nl> | 2022-04-22 15:29:27 +0200 |
| commit | e50d78e11ae81f745f5b11ef443e43a79a782dc1 (patch) | |
| tree | 24a7895d353cb3ab5308e174645bdcfe0de42708 | |
| parent | 9a76f06ecadf05ef1d26bd735df1bea0dfb15d59 (diff) | |
| download | nextcloud-server-e50d78e11ae81f745f5b11ef443e43a79a782dc1.tar.gz nextcloud-server-e50d78e11ae81f745f5b11ef443e43a79a782dc1.zip | |
use and cache root storage info if a share can't be resolved
as is a broken share will never be cached
Signed-off-by: Robin Appelman <robin@icewind.nl>
| -rw-r--r-- | lib/private/legacy/OC_Helper.php | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/lib/private/legacy/OC_Helper.php b/lib/private/legacy/OC_Helper.php index 68fb4311ef8..0d1903007c2 100644 --- a/lib/private/legacy/OC_Helper.php +++ b/lib/private/legacy/OC_Helper.php @@ -48,6 +48,7 @@ use OC\Files\Filesystem; use OCP\Files\Mount\IMountPoint; use OCP\ICacheFactory; use OCP\IUser; +use Psr\Log\LoggerInterface; use Symfony\Component\Process\ExecutableFinder; /** @@ -518,7 +519,6 @@ class OC_Helper { $sourceStorage = $storage; if ($storage->instanceOfStorage('\OCA\Files_Sharing\SharedStorage')) { $includeExtStorage = false; - $sourceStorage = $storage->getSourceStorage(); $internalPath = $storage->getUnjailedPath($rootInfo->getInternalPath()); } else { $internalPath = $rootInfo->getInternalPath(); @@ -544,7 +544,19 @@ class OC_Helper { /** @var \OC\Files\Storage\Wrapper\Quota $storage */ $quota = $sourceStorage->getQuota(); } - $free = $sourceStorage->free_space($internalPath); + try { + $free = $sourceStorage->free_space($internalPath); + } catch (\Exception $e) { + if ($path === "") { + throw $e; + } + /** @var LoggerInterface $logger */ + $logger = \OC::$server->get(LoggerInterface::class); + $logger->warning("Error while getting quota info, using root quota", ['exception' => $e]); + $rootInfo = self::getStorageInfo(""); + $memcache->set($cacheKey, $rootInfo, 5 * 60); + return $rootInfo; + } if ($free >= 0) { $total = $free + $used; } else { |