public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removing random interval in feed fetches.

Browse source
This commit is contained in:
Samuel Clay 2013-04-18 16:56:54 -07:00
parent 2d1a81694a
commit 5db1cebecf
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
apps/rss_feeds/models.py
View file

@ -1257,8 +1257,7 @@ class Feed(models.Model):
def get_next_scheduled_update(self, force=False, verbose=True):
if self.min_to_decay and not force:
random_factor = random.randint(0, self.min_to_decay) / 4
return self.min_to_decay, random_factor
return self.min_to_decay
# Use stories per month to calculate next feed update
updates_per_month = self.stories_last_month
@ -1313,9 +1312,9 @@ class Feed(models.Model):
elif ((self.stories_last_month == 0 or self.average_stories_per_month == 0)):
total = total * 12
# 1 month max
if total > 60*24*30:
total = 60*24*30
# 1 week max
if total > 60*24*7:
total = 60*24*7
if verbose:
logging.debug(" ---> [%-30s] Fetched every %sm (%s+%s+%s) Subs: %s/%s Stories: %s/%s" % (
@ -1327,13 +1326,11 @@ class Feed(models.Model):
self.active_premium_subscribers,
self.average_stories_per_month,
self.stories_last_month))
random_factor = random.randint(0, total) / 4
return total, random_factor
return total
def set_next_scheduled_update(self, verbose=False, skip_scheduling=False):
r = redis.Redis(connection_pool=settings.REDIS_FEED_POOL)
total, random_factor = self.get_next_scheduled_update(force=True, verbose=verbose)
total = self.get_next_scheduled_update(force=True, verbose=verbose)
error_count = self.error_count
if error_count:
@ -1342,7 +1339,8 @@ class Feed(models.Model):
logging.debug(' ---> [%-30s] ~FBScheduling feed fetch geometrically: '
'~SB%s errors. Time: %s min' % (
unicode(self)[:30], self.errors_since_good, total))
random_factor = random.randint(0, total) / 4
next_scheduled_update = datetime.datetime.utcnow() + datetime.timedelta(
minutes = total + random_factor)

4
apps/rss_feeds/views.py
View file

@ -140,7 +140,7 @@ def load_feed_statistics(request, feed_id):
stats['next_update'] = relative_timeuntil(feed.next_scheduled_update)
# Minutes between updates
update_interval_minutes, _ = feed.get_next_scheduled_update(force=True, verbose=False)
update_interval_minutes = feed.get_next_scheduled_update(force=True, verbose=False)
if feed.is_push:
stats['update_interval_minutes'] = 0
else:
@ -149,7 +149,7 @@ def load_feed_statistics(request, feed_id):
original_premium_subscribers = feed.premium_subscribers
feed.active_premium_subscribers = max(feed.active_premium_subscribers+1, 1)
feed.premium_subscribers += 1
premium_update_interval_minutes, _ = feed.get_next_scheduled_update(force=True, verbose=False)
premium_update_interval_minutes = feed.get_next_scheduled_update(force=True, verbose=False)
feed.active_premium_subscribers = original_active_premium_subscribers
feed.premium_subscribers = original_premium_subscribers
if feed.is_push: