diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-02-15 18:47:45 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-02-15 18:47:45 +0000 |
| commit | 8eea75dc3f4138a0b216e8d662089d2c930d5d45 (patch) | |
| tree | 91dfcb8e0e0400a737d30d3aad88e63633aa2742 /indra/lib/python/indra/ipc | |
| parent | 383f92e54369a47a96afb3467c680f870df700a1 (diff) | |
svn merge -r 79841:79886 svn+ssh://svn.lindenlab.com/svn/linden/branches/self-contained-unit-test --> release
QAR-291/QAR-284/QAR-246 - Self-Contained Unit Test
Diffstat (limited to 'indra/lib/python/indra/ipc')
| -rw-r--r-- | indra/lib/python/indra/ipc/mysql_pool.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/lib/python/indra/ipc/mysql_pool.py b/indra/lib/python/indra/ipc/mysql_pool.py index 6288a4c732..827b6d42e9 100644 --- a/indra/lib/python/indra/ipc/mysql_pool.py +++ b/indra/lib/python/indra/ipc/mysql_pool.py @@ -64,12 +64,13 @@ connection pools keyed on host,databasename""" else: return self._credentials.get('default', None) - def get(self, host, dbname): - key = (host, dbname) + def get(self, host, dbname, port=3306): + key = (host, dbname, port) if key not in self._databases: new_kwargs = self._kwargs.copy() new_kwargs['db'] = dbname new_kwargs['host'] = host + new_kwargs['port'] = port new_kwargs.update(self.credentials_for(host)) dbpool = ConnectionPool(self._min_size, self._max_size, *self._args, **new_kwargs) self._databases[key] = dbpool |