mirror of
https://github.com/samuelclay/NewsBlur.git
synced 2025-08-31 21:41:33 +00:00
Adding new debug to feed fetcher.
This commit is contained in:
parent
cc578ce274
commit
2954ef7318
2 changed files with 6 additions and 1 deletions
|
@ -1046,6 +1046,7 @@ class Feed(models.Model):
|
|||
'timeout': 10,
|
||||
'single_threaded': kwargs.get('single_threaded', True),
|
||||
'force': kwargs.get('force'),
|
||||
'force_fp': kwargs.get('force_fp'),
|
||||
'compute_scores': kwargs.get('compute_scores', True),
|
||||
'mongodb_replication_lag': kwargs.get('mongodb_replication_lag', None),
|
||||
'fake': kwargs.get('fake'),
|
||||
|
|
|
@ -145,10 +145,14 @@ class FetchFeed:
|
|||
response_headers['Content-Location'] = raw_feed.url
|
||||
self.fpf = feedparser.parse(smart_unicode(raw_feed.content),
|
||||
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:
|
||||
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:
|
||||
self.fpf = feedparser.parse(address,
|
||||
agent=USER_AGENT,
|
||||
|
|
Loading…
Add table
Reference in a new issue