From a22f650d56176e5fd3577825cb34fc6dd390ce7c Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Wed, 26 Jan 2011 17:45:04 -0500 Subject: [PATCH] Fixing errors in feed fetching. --- apps/rss_feeds/models.py | 2 +- utils/feed_fetcher.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/rss_feeds/models.py b/apps/rss_feeds/models.py index 266e04667..926dc4a94 100644 --- a/apps/rss_feeds/models.py +++ b/apps/rss_feeds/models.py @@ -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) diff --git a/utils/feed_fetcher.py b/utils/feed_fetcher.py index b2302ac78..85e6c0f97 100644 --- a/utils/feed_fetcher.py +++ b/utils/feed_fetcher.py @@ -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,))