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

Adding new debug to feed fetcher.

Browse source
This commit is contained in:
Samuel Clay 2017-02-17 11:45:43 -08:00
parent cc578ce274
commit 2954ef7318
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/rss_feeds/models.py
View file

@ -1046,6 +1046,7 @@ class Feed(models.Model):
'timeout': 10, 'timeout': 10,
'single_threaded': kwargs.get('single_threaded', True), 'single_threaded': kwargs.get('single_threaded', True),
'force': kwargs.get('force'), 'force': kwargs.get('force'),
'force_fp': kwargs.get('force_fp'),
'compute_scores': kwargs.get('compute_scores', True), 'compute_scores': kwargs.get('compute_scores', True),
'mongodb_replication_lag': kwargs.get('mongodb_replication_lag', None), 'mongodb_replication_lag': kwargs.get('mongodb_replication_lag', None),
'fake': kwargs.get('fake'), 'fake': kwargs.get('fake'),

6
utils/feed_fetcher.py
View file

@ -145,10 +145,14 @@ class FetchFeed:
response_headers['Content-Location'] = raw_feed.url response_headers['Content-Location'] = raw_feed.url
self.fpf = feedparser.parse(smart_unicode(raw_feed.content), self.fpf = feedparser.parse(smart_unicode(raw_feed.content),
response_headers=response_headers) response_headers=response_headers)
if self.options.get('debug', False):
logging.debug(" ---> [%-30s] ~FBFeed fetch status %s: %s length / %s" % (self.feed.title[:30], raw_feed.status_code, len(smart_unicode(raw_feed.content)), raw_feed.headers))
else:
logging.debug(" ---> [%-30s] ~FRFeed fetch was empty, trying feedparser: %s" % (self.feed.title[:30], raw_feed.headers))
except Exception, e: except Exception, e:
logging.debug(" ---> [%-30s] ~FRFeed failed to fetch with request, trying feedparser: %s" % (self.feed.title[:30], unicode(e)[:100])) logging.debug(" ---> [%-30s] ~FRFeed failed to fetch with request, trying feedparser: %s" % (self.feed.title[:30], unicode(e)[:100]))
if not self.fpf: if not self.fpf or self.options.get('force_fp', False):
try: try:
self.fpf = feedparser.parse(address, self.fpf = feedparser.parse(address,
agent=USER_AGENT, agent=USER_AGENT,