diff options
Diffstat (limited to 'lib/private/App')
| -rw-r--r-- | lib/private/App/AppStore/Fetcher/Fetcher.php | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/lib/private/App/AppStore/Fetcher/Fetcher.php b/lib/private/App/AppStore/Fetcher/Fetcher.php index a844d9d7913..305e3172c10 100644 --- a/lib/private/App/AppStore/Fetcher/Fetcher.php +++ b/lib/private/App/AppStore/Fetcher/Fetcher.php @@ -42,6 +42,7 @@ use OCP\ILogger; abstract class Fetcher { public const INVALIDATE_AFTER_SECONDS = 3600; + public const RETRY_AFTER_FAILURE_SECONDS = 300; /** @var IAppData */ protected $appData; @@ -91,6 +92,9 @@ abstract class Fetcher { */ protected function fetch($ETag, $content) { $appstoreenabled = $this->config->getSystemValue('appstoreenabled', true); + if ((int)$this->config->getAppValue('settings', 'appstore-fetcher-lastFailure', '0') > time() - self::RETRY_AFTER_FAILURE_SECONDS) { + return []; + } if (!$appstoreenabled) { return []; @@ -107,7 +111,12 @@ abstract class Fetcher { } $client = $this->clientService->newClient(); - $response = $client->get($this->getEndpoint(), $options); + try { + $response = $client->get($this->getEndpoint(), $options); + } catch (ConnectException $e) { + $this->config->setAppValue('settings', 'appstore-fetcher-lastFailure', (string)time()); + throw $e; + } $responseJson = []; if ($response->getStatusCode() === Http::STATUS_NOT_MODIFIED) { @@ -116,6 +125,7 @@ abstract class Fetcher { $responseJson['data'] = json_decode($response->getBody(), true); $ETag = $response->getHeader('ETag'); } + $this->config->deleteAppValue('settings', 'appstore-fetcher-lastFailure'); $responseJson['timestamp'] = $this->timeFactory->getTime(); $responseJson['ncversion'] = $this->getVersion(); @@ -175,6 +185,11 @@ abstract class Fetcher { // Refresh the file content try { $responseJson = $this->fetch($ETag, $content, $allowUnstable); + + if (empty($responseJson)) { + return []; + } + // Don't store the apps request file if ($allowUnstable) { return $responseJson['data']; |