diff options
| author | provokateurin <kate@provokateurin.de> | 2024-11-15 14:25:51 +0100 |
|---|---|---|
| committer | backportbot[bot] <backportbot[bot]@users.noreply.github.com> | 2024-11-25 11:45:52 +0000 |
| commit | 8e9e893d29ccaf44981c02f75a6269ee3e13ac43 (patch) | |
| tree | fb43a30d595b953914d8a597156fece00a67d178 /lib/private | |
| parent | 28d70d1dd8f2a781d0e4a40e88c65fee76d9673e (diff) | |
| download | nextcloud-server-8e9e893d29ccaf44981c02f75a6269ee3e13ac43.tar.gz nextcloud-server-8e9e893d29ccaf44981c02f75a6269ee3e13ac43.zip | |
fix(OCMDiscoveryService): Also cache error results during discoverybackport/49311/stable30
Signed-off-by: provokateurin <kate@provokateurin.de>
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/OCM/OCMDiscoveryService.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/private/OCM/OCMDiscoveryService.php b/lib/private/OCM/OCMDiscoveryService.php index 62313a9af80..377861b2eef 100644 --- a/lib/private/OCM/OCMDiscoveryService.php +++ b/lib/private/OCM/OCMDiscoveryService.php @@ -55,7 +55,12 @@ class OCMDiscoveryService implements IOCMDiscoveryService { if (!$skipCache) { try { - $this->provider->import(json_decode($this->cache->get($remote) ?? '', true, 8, JSON_THROW_ON_ERROR) ?? []); + $cached = $this->cache->get($remote); + if ($cached === false) { + throw new OCMProviderException('Previous discovery failed.'); + } + + $this->provider->import(json_decode($cached ?? '', true, 8, JSON_THROW_ON_ERROR) ?? []); if ($this->supportedAPIVersion($this->provider->getApiVersion())) { return $this->provider; // if cache looks valid, we use it } @@ -82,8 +87,10 @@ class OCMDiscoveryService implements IOCMDiscoveryService { $this->cache->set($remote, $body, 60 * 60 * 24); } } catch (JsonException|OCMProviderException $e) { + $this->cache->set($remote, false, 5 * 60); throw new OCMProviderException('data returned by remote seems invalid - ' . ($body ?? '')); } catch (\Exception $e) { + $this->cache->set($remote, false, 5 * 60); $this->logger->warning('error while discovering ocm provider', [ 'exception' => $e, 'remote' => $remote @@ -92,6 +99,7 @@ class OCMDiscoveryService implements IOCMDiscoveryService { } if (!$this->supportedAPIVersion($this->provider->getApiVersion())) { + $this->cache->set($remote, false, 5 * 60); throw new OCMProviderException('API version not supported'); } |