pub/mongoengine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated connection for pymongo 2.1 support

Browse Source 
closes #378
This commit is contained in:
Ross Lawley
2011-12-09 08:26:39 -08:00
parent 3c271845c9
commit 83e3c5c7d8
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mongoengine/connection.py
View File

@@ -1,4 +1,4 @@
from pymongo import Connection from pymongo import Connection, version_tuple
__all__ = ['ConnectionError', 'connect', 'register_connection', __all__ = ['ConnectionError', 'connect', 'register_connection',
@@ -18,8 +18,8 @@ _dbs = {}
def register_connection(alias, name, host='localhost', port=27017, def register_connection(alias, name, host='localhost', port=27017,
is_slave=False, slaves=None, username=None, is_slave=False, read_preference=False, slaves=None,
password=None): username=None, password=None):
"""Add a connection. """Add a connection.
:param alias: the name that will be used to refer to this connection :param alias: the name that will be used to refer to this connection
@@ -27,11 +27,13 @@ def register_connection(alias, name, host='localhost', port=27017,
:param name: the name of the specific database to use :param name: the name of the specific database to use
:param host: the host name of the :program:`mongod` instance to connect to :param host: the host name of the :program:`mongod` instance to connect to
:param port: the port that the :program:`mongod` instance is running on :param port: the port that the :program:`mongod` instance is running on
:param is_slave: whether the connection can act as a slave :param is_slave: whether the connection can act as a slave ** Depreciated pymongo 2.0.1+
:param read_preference: The read preference for the collection ** Added pymongo 2.1
:param slaves: a list of aliases of slave connections; each of these must :param slaves: a list of aliases of slave connections; each of these must
be a registered connection that has :attr:`is_slave` set to ``True`` be a registered connection that has :attr:`is_slave` set to ``True``
:param username: username to authenticate with :param username: username to authenticate with
:param password: password to authenticate with :param password: password to authenticate with
""" """
global _connection_settings global _connection_settings
_connection_settings[alias] = { _connection_settings[alias] = {
@@ -42,6 +44,7 @@ def register_connection(alias, name, host='localhost', port=27017,
'slaves': slaves or [], 'slaves': slaves or [],
'username': username, 'username': username,
'password': password, 'password': password,
'read_preference': read_preference
} }
@@ -70,11 +73,19 @@ def get_connection(alias=DEFAULT_CONNECTION_NAME, reconnect=False):
raise ConnectionError(msg) raise ConnectionError(msg)
conn_settings = _connection_settings[alias].copy() conn_settings = _connection_settings[alias].copy()
if version_tuple[0] >= 2 and version_tuple [1] > 0:
conn_settings.pop('name')
conn_settings.pop('slaves')
conn_settings.pop('is_slave')
conn_settings.pop('username')
conn_settings.pop('password')
else:
# Get all the slave connections # Get all the slave connections
slaves = [] slaves = []
for slave_alias in conn_settings['slaves']: for slave_alias in conn_settings['slaves']:
slaves.append(get_connection(slave_alias)) slaves.append(get_connection(slave_alias))
conn_settings['slaves'] = slaves conn_settings['slaves'] = slaves
conn_settings.pop('read_preference')
try: try:
_connections[alias] = Connection(**conn_settings) _connections[alias] = Connection(**conn_settings)