From 9f3b63b5f986fe583a89226f8412e9e91f5f4ca2 Mon Sep 17 00:00:00 2001 From: Benjamin Brahmer Date: Sun, 14 Nov 2021 11:28:33 +0100 Subject: Catch network errors while fetching feed logos, fixes #1570 Signed-off-by: Benjamin Brahmer --- lib/Fetcher/FeedFetcher.php | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/Fetcher/FeedFetcher.php b/lib/Fetcher/FeedFetcher.php index 7423c66df..5b48070d5 100755 --- a/lib/Fetcher/FeedFetcher.php +++ b/lib/Fetcher/FeedFetcher.php @@ -20,6 +20,7 @@ use FeedIo\FeedInterface; use FeedIo\FeedIo; use GuzzleHttp\Client; use GuzzleHttp\Exception\RequestException; +use GuzzleHttp\Exception\ConnectException; use Net_URL2; use OCP\IL10N; @@ -376,14 +377,14 @@ class FeedFetcher implements IFeedFetcher 'logo' => $favicon ] ); - } catch (RequestException $e) { - $this->logger->info( - 'An error occurred while trying to download the feed logo of {url}: {error}', - [ - 'url' => $url, - 'error' => $e->getResponse() ?? 'Unknown' - ] - ); + } catch (RequestException | ConnectException $e) { + $this->logger->info( + 'An error occurred while trying to download the feed logo of {url}: {error}', + [ + 'url' => $url, + 'error' => $e->getResponse() ?? 'Unknown' + ] + ); } $is_image = $downloaded && substr(mime_content_type($favicon_path), 0, 5) === "image"; -- cgit v1.2.3