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

Better logging for queues.

Browse source
This commit is contained in:
Samuel Clay 2013-04-04 20:47:41 -07:00
parent 49f1401953
commit 341db243c3
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/rss_feeds/models.py
View file

@ -743,12 +743,12 @@ class Feed(models.Model):
def update(self, **kwargs): def update(self, **kwargs):
from utils import feed_fetcher from utils import feed_fetcher
r = redis.Redis(connection_pool=settings.REDIS_FEED_POOL) r = redis.Redis(connection_pool=settings.REDIS_FEED_POOL)
original_feed_id = self.pk
if getattr(settings, 'TEST_DEBUG', False): if getattr(settings, 'TEST_DEBUG', False):
self.feed_address = self.feed_address % {'NEWSBLUR_DIR': settings.NEWSBLUR_DIR} self.feed_address = self.feed_address % {'NEWSBLUR_DIR': settings.NEWSBLUR_DIR}
self.feed_link = self.feed_link % {'NEWSBLUR_DIR': settings.NEWSBLUR_DIR} self.feed_link = self.feed_link % {'NEWSBLUR_DIR': settings.NEWSBLUR_DIR}
self.save() self.save()
original_feed_id = self.pk
options = { options = {
'verbose': kwargs.get('verbose'), 'verbose': kwargs.get('verbose'),
@ -776,7 +776,11 @@ class Feed(models.Model):
if options['force']: if options['force']:
feed.sync_redis() feed.sync_redis()
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) r.zrem('tasked_feeds', original_feed_id)
if feed:
r.zrem('tasked_feeds', feed.pk)
return feed return feed

5
apps/rss_feeds/tasks.py
View file

@ -56,9 +56,10 @@ class TaskFeeds(Task):
if inactive_count: if inactive_count:
r.zremrangebyscore('tasked_feeds', 0, hours_ago) r.zremrangebyscore('tasked_feeds', 0, hours_ago)
r.sadd('queued_feeds', *old_tasked_feeds) 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, inactive_count,
r.scard('queued_feeds'))) r.scard('queued_feeds'),
r.zcard('tasked_feeds')))
cp3 = time.time() cp3 = time.time()
old = now - datetime.timedelta(days=1) old = now - datetime.timedelta(days=1)