public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-08-31 21:41:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Also handling time out in feedparser.

Browse source
This commit is contained in:
Samuel Clay 2023-05-09 09:35:56 -04:00
parent 792ba9d204
commit 8adc2035ea
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
utils/feed_fetcher.py
View file

@ -195,10 +195,13 @@ class FetchFeed:
except (requests.adapters.ConnectionError, TimeoutError): except (requests.adapters.ConnectionError, TimeoutError):
raw_feed = None raw_feed = None
if not raw_feed or raw_feed.status_code >= 400: if not raw_feed or raw_feed.status_code >= 400:
logging.debug( if raw_feed:
" ***> [%-30s] ~FRFeed fetch was %s status code, trying fake user agent: %s" logging.debug(
% (self.feed.log_title[:30], raw_feed.status_code, raw_feed.headers) " ***> [%-30s] ~FRFeed fetch was %s status code, trying fake user agent: %s"
) % (self.feed.log_title[:30], raw_feed.status_code, raw_feed.headers)
)
else:
logging.debug(" ***> [%-30s] ~FRFeed fetch timed out, trying fake headers: %s" % (self.feed.log_title[:30], address))
raw_feed = requests.get( raw_feed = requests.get(
self.feed.feed_address, self.feed.feed_address,
headers=self.feed.fetch_headers(fake=True), headers=self.feed.fetch_headers(fake=True),
@ -254,6 +257,7 @@ class FetchFeed:
http.client.BadStatusLine, http.client.BadStatusLine,
http.client.IncompleteRead, http.client.IncompleteRead,
ConnectionResetError, ConnectionResetError,
TimeoutError,
) as e: ) as e:
logging.debug(' ***> [%-30s] ~FRFeed fetch error: %s' % (self.feed.log_title[:30], e)) logging.debug(' ***> [%-30s] ~FRFeed fetch error: %s' % (self.feed.log_title[:30], e))
pass pass