From 341db243c310a03b5101fedafbce5fe7c797d053 Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Thu, 4 Apr 2013 20:47:41 -0700 Subject: [PATCH] Better logging for queues. --- apps/rss_feeds/models.py | 10 +++++++--- apps/rss_feeds/tasks.py | 5 +++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/apps/rss_feeds/models.py b/apps/rss_feeds/models.py index 544059825..fb9190699 100644 --- a/apps/rss_feeds/models.py +++ b/apps/rss_feeds/models.py @@ -743,13 +743,13 @@ class Feed(models.Model): def update(self, **kwargs): from utils import feed_fetcher r = redis.Redis(connection_pool=settings.REDIS_FEED_POOL) + original_feed_id = self.pk if getattr(settings, 'TEST_DEBUG', False): self.feed_address = self.feed_address % {'NEWSBLUR_DIR': settings.NEWSBLUR_DIR} self.feed_link = self.feed_link % {'NEWSBLUR_DIR': settings.NEWSBLUR_DIR} self.save() - original_feed_id = self.pk - + options = { 'verbose': kwargs.get('verbose'), 'timeout': 10, @@ -776,7 +776,11 @@ class Feed(models.Model): if options['force']: feed.sync_redis() - r.zrem('tasked_feeds', original_feed_id) + if not feed or original_feed_id != feed.pk: + logging.info(" ---> ~FRFeed changed id, removing %s from tasked_feeds queue..." % original_feed_id) + r.zrem('tasked_feeds', original_feed_id) + if feed: + r.zrem('tasked_feeds', feed.pk) return feed diff --git a/apps/rss_feeds/tasks.py b/apps/rss_feeds/tasks.py index 0c5817dbd..8c05a8040 100644 --- a/apps/rss_feeds/tasks.py +++ b/apps/rss_feeds/tasks.py @@ -56,9 +56,10 @@ class TaskFeeds(Task): if inactive_count: r.zremrangebyscore('tasked_feeds', 0, hours_ago) r.sadd('queued_feeds', *old_tasked_feeds) - logging.debug(" ---> ~SN~FBRe-queuing ~SB%s~SN dropped feeds (~SB%s~SN queued)" % ( + logging.debug(" ---> ~SN~FBRe-queuing ~SB%s~SN dropped feeds (~SB%s/%s~SN queued/tasked)" % ( inactive_count, - r.scard('queued_feeds'))) + r.scard('queued_feeds'), + r.zcard('tasked_feeds'))) cp3 = time.time() old = now - datetime.timedelta(days=1)