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

Backtracking on mongoengine and pymongo upgrades.

Browse source
This commit is contained in:
Samuel Clay 2015-07-20 17:31:45 -07:00
parent 6d652d75f5
commit 8ef0454982
3 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
config/requirements.txt
View file

@ -1,5 +1,5 @@
BeautifulSoup==3.2.1
six==1.6.1
six==1.6
boto==2.8.0
celery==3.0.17
chardet==2.1.1
@ -23,14 +23,14 @@ iconv==1.0
isodate==0.5.1
kombu==2.5.7
lxml==3.3.5
mongoengine==0.10.0
mongoengine==0.8.2
nltk==2.0.5
oauth2==1.5.211
psutil==2.1.0
pyes==0.90.1
simplejson==3.4.0
pyflakes==0.6.1
pymongo==3.0.3
pymongo==2.6
python-dateutil==2.1
python-gflags==2.0
pytz==2013b

10
settings.py
View file

@ -602,7 +602,7 @@ MONGO_DB_DEFAULTS = {
'alias': 'default',
}
MONGO_DB = dict(MONGO_DB_DEFAULTS, **MONGO_DB)
MONGO_URI = 'mongodb://%s' % (MONGO_DB.pop('host'),)
# MONGO_URI = 'mongodb://%s' % (MONGO_DB.pop('host'),)
# if MONGO_DB.get('read_preference', pymongo.ReadPreference.PRIMARY) != pymongo.ReadPreference.PRIMARY:
# MONGO_PRIMARY_DB = MONGO_DB.copy()
@ -610,7 +610,8 @@ MONGO_URI = 'mongodb://%s' % (MONGO_DB.pop('host'),)
# MONGOPRIMARYDB = connect(MONGO_PRIMARY_DB.pop('name'), **MONGO_PRIMARY_DB)
# else:
# MONGOPRIMARYDB = MONGODB
MONGODB = connect(MONGO_DB.pop('name'), host=MONGO_URI, **MONGO_DB)
# MONGODB = connect(MONGO_DB.pop('name'), host=MONGO_URI, **MONGO_DB)
MONGODB = connect(MONGO_DB.pop('name'), **MONGO_DB)
MONGO_ANALYTICS_DB_DEFAULTS = {
'name': 'nbanalytics',
@ -618,8 +619,9 @@ MONGO_ANALYTICS_DB_DEFAULTS = {
'alias': 'nbanalytics',
}
MONGO_ANALYTICS_DB = dict(MONGO_ANALYTICS_DB_DEFAULTS, **MONGO_ANALYTICS_DB)
MONGO_ANALYTICS_URI = 'mongodb://%s' % (MONGO_ANALYTICS_DB.pop('host'),)
MONGOANALYTICSDB = connect(MONGO_ANALYTICS_DB.pop('name'), host=MONGO_ANALYTICS_URI, **MONGO_ANALYTICS_DB)
# MONGO_ANALYTICS_URI = 'mongodb://%s' % (MONGO_ANALYTICS_DB.pop('host'),)
# MONGOANALYTICSDB = connect(MONGO_ANALYTICS_DB.pop('name'), host=MONGO_ANALYTICS_URI, **MONGO_ANALYTICS_DB)
MONGOANALYTICSDB = connect(MONGO_ANALYTICS_DB.pop('name'), **MONGO_ANALYTICS_DB)
# =========

5
utils/mongo_raw_log_middleware.py
View file

@ -55,8 +55,9 @@ class MongoDumpMiddleware(object):
def _instrument(self, original_method):
def instrumented_method(*args, **kwargs):
query = args[1].get_message(False, False)
message = _mongodb_decode_wire_protocol(query[1])
# query = args[1].get_message(False, False)
# message = _mongodb_decode_wire_protocol(query[1])
message = _mongodb_decode_wire_protocol(args[1][1])
if not message or message['msg_id'] in self._used_msg_ids:
return original_method(*args, **kwargs)
self._used_msg_ids.append(message['msg_id'])