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

Cleaning up mongoengine imports and settings for default MongoDB.

Browse source
This commit is contained in:
Samuel Clay 2011-12-11 11:41:12 -08:00
parent 1828d949d8
commit 6d0b8baa83
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
fabfile.py vendored
View file

@ -344,14 +344,17 @@ def setup_pymongo_repo():
def setup_forked_mongoengine(): def setup_forked_mongoengine():
with cd(os.path.join(env.VENDOR_PATH, 'mongoengine')): with cd(os.path.join(env.VENDOR_PATH, 'mongoengine')):
with settings(warn_only=True): with settings(warn_only=True):
run('git remote add github http://github.com/samuelclay/mongoengine') run('git checkout master')
run('git checkout dev') run('git branch -D dev')
run('git pull github dev') run('git remote add sclay git://github.com/samuelclay/mongoengine.git')
run('git fetch sclay')
run('git checkout -b dev sclay/dev')
run('git pull sclay dev')
def switch_forked_mongoengine(): def switch_forked_mongoengine():
with cd(os.path.join(env.VENDOR_PATH, 'mongoengine')): with cd(os.path.join(env.VENDOR_PATH, 'mongoengine')):
run('git co dev') run('git co dev')
run('git pull github dev --force') run('git pull sclay dev --force')
# run('git checkout .') # run('git checkout .')
# run('git checkout master') # run('git checkout master')
# run('get branch -D dev') # run('get branch -D dev')

5
settings.py
View file

@ -2,7 +2,6 @@ import sys
import logging import logging
import os import os
from mongoengine import connect from mongoengine import connect
import pymongo
import redis import redis
# =========================== # ===========================
@ -462,9 +461,7 @@ DEBUG_TOOLBAR_CONFIG = {
MONGO_DB_DEFAULTS = { MONGO_DB_DEFAULTS = {
'name': 'newsblur', 'name': 'newsblur',
'host': 'mongodb://db01,db03/?slaveOk=true', 'host': 'db01,db03',
'read_preference': pymongo.ReadPreference.PRIMARY,
'replica_set': 'nbset',
} }
MONGO_DB = dict(MONGO_DB_DEFAULTS, **MONGO_DB) MONGO_DB = dict(MONGO_DB_DEFAULTS, **MONGO_DB)
MONGODB = connect(MONGO_DB.pop('name'), **MONGO_DB) MONGODB = connect(MONGO_DB.pop('name'), **MONGO_DB)