public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-08-05 16:58:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing errors in feed fetching.

Browse source
This commit is contained in:
Samuel Clay 2011-01-26 17:45:04 -05:00
parent ab9a6a2f21
commit a22f650d56
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/rss_feeds/models.py
View file

@ -722,7 +722,7 @@ class FeedData(models.Model):
try:
super(FeedData, self).save(*args, **kwargs)
except (IntegrityError, OperationError):
self.delete()
if self.id: self.delete()
class MFeedPage(mongo.Document):
feed_id = mongo.IntField(primary_key=True)

2
utils/feed_fetcher.py
View file

@ -309,7 +309,7 @@ class Dispatcher:
continue
except TimeoutError, e:
logging.debug(' ---> [%-30s] Feed fetch timed out...' % (unicode(feed)[:30]))
feed.save_feed_history(505, e.msg, e.fp.read())
feed.save_feed_history(505, 'Timeout', e.fp.read())
fetched_feed = None
except Exception, e:
logging.debug('[%d] ! -------------------------' % (feed_id,))