From 16fe96f23bca6badf4b3e0faab93207e916e42ad Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Thu, 29 May 2014 16:02:07 -0700 Subject: [PATCH] Draining feeds also clears out error feeds. --- apps/rss_feeds/models.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/apps/rss_feeds/models.py b/apps/rss_feeds/models.py index 038de4baf..35d07c8ca 100644 --- a/apps/rss_feeds/models.py +++ b/apps/rss_feeds/models.py @@ -441,13 +441,18 @@ class Feed(models.Model): UpdateFeeds.apply_async(args=(feed_id,), queue='update_feeds') @classmethod - def drain_task_feeds(cls, empty=False): + def drain_task_feeds(cls): r = redis.Redis(connection_pool=settings.REDIS_FEED_POOL) - if not empty: - tasked_feeds = r.zrange('tasked_feeds', 0, -1) - logging.debug(" ---> ~FRDraining %s feeds..." % len(tasked_feeds)) - r.sadd('queued_feeds', *tasked_feeds) + + tasked_feeds = r.zrange('tasked_feeds', 0, -1) + logging.debug(" ---> ~FRDraining %s tasked feeds..." % len(tasked_feeds)) + r.sadd('queued_feeds', *tasked_feeds) r.zremrangebyrank('tasked_feeds', 0, -1) + + errored_feeds = r.zrange('error_feeds', 0, -1) + logging.debug(" ---> ~FRDraining %s errored feeds..." % len(errored_feeds)) + r.sadd('queued_feeds', *errored_feeds) + r.zremrangebyrank('error_feeds', 0, -1) def update_all_statistics(self, full=True, force=False): self.count_subscribers()