public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-08-31 21:41:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing race condition between primary adn secondaries when creating feed fetch histories.

Browse source
This commit is contained in:
Samuel Clay 2013-04-15 15:09:04 -07:00
parent abbc05660f
commit 2ccd7b6cfe
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
apps/rss_feeds/models.py
View file

@ -8,6 +8,7 @@ import mongoengine as mongo
import zlib import zlib
import hashlib import hashlib
import redis import redis
import pymongo
from urlparse import urlparse from urlparse import urlparse
from collections import defaultdict from collections import defaultdict
from operator import itemgetter from operator import itemgetter
@ -1762,8 +1763,12 @@ class MFetchHistory(mongo.Document):
@classmethod @classmethod
def feed(cls, feed_id, timezone=None): def feed(cls, feed_id, timezone=None):
fetch_history, _ = cls.objects.get_or_create(feed_id=feed_id) fetch_history, _ = cls.objects.get_or_create(
feed_id=feed_id,
read_preference=pymongo.ReadPreference.PRIMARY
)
history = {} history = {}
for fetch_type in ['feed_fetch_history', 'page_fetch_history', 'push_history']: for fetch_type in ['feed_fetch_history', 'page_fetch_history', 'push_history']:
history[fetch_type] = getattr(fetch_history, fetch_type) history[fetch_type] = getattr(fetch_history, fetch_type)
if not history[fetch_type]: if not history[fetch_type]:
@ -1783,7 +1788,10 @@ class MFetchHistory(mongo.Document):
if not date: if not date:
date = datetime.datetime.now() date = datetime.datetime.now()
fetch_history, _ = cls.objects.get_or_create(feed_id=feed_id) fetch_history, _ = cls.objects.get_or_create(
feed_id=feed_id,
read_preference=pymongo.ReadPreference.PRIMARY
)
if fetch_type == 'feed': if fetch_type == 'feed':
history = fetch_history.feed_fetch_history or [] history = fetch_history.feed_fetch_history or []
elif fetch_type == 'page': elif fetch_type == 'page':
@ -1828,7 +1836,10 @@ class MFetchExceptionHistory(mongo.Document):
if not isinstance(exception, basestring): if not isinstance(exception, basestring):
exception = unicode(exception) exception = unicode(exception)
fetch_exception, _ = cls.objects.get_or_create(feed_id=feed_id) fetch_exception, _ = cls.objects.get_or_create(
feed_id=feed_id,
read_preference=pymongo.ReadPreference.PRIMARY
)
fetch_exception.date = date fetch_exception.date = date
fetch_exception.code = code fetch_exception.code = code
fetch_exception.message = message fetch_exception.message = message