odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] connection pool when database password is provided (thanks to Syleam Crew) 

lp bug: https://launchpad.net/bugs/488234 fixed

bzr revid: chs@tinyerp.com-20091127231126-lbdmz9i9tm50k8f7
This commit is contained in:
Christophe Simonis 2009-11-28 00:11:26 +01:00
parent 3848875161
commit 2081fa0959
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bin/sql_db.py
View File

@ -235,7 +235,7 @@ class ConnectionPool(object):
result = None
for i, (cnx, used) in enumerate(self._connections):
if not used and cnx.dsn == dsn:
if not used and dsn_are_equals(cnx.dsn, dsn):
self._debug('Existing connection found at index %d' % i)
self._connections.pop(i)
@ -276,7 +276,7 @@ class ConnectionPool(object):
@locked
def close_all(self, dsn):
for i, (cnx, used) in tools.reverse_enumerate(self._connections):
if cnx.dsn == dsn:
if dsn_are_equals(cnx.dsn, dsn):
cnx.close()
self._connections.pop(i)
@ -295,6 +295,7 @@ class Connection(object):
def __del__(self):
if self._unique:
close_db(self.dbname)
self.__LOCKS[self.dbname].release()
def cursor(self, serialized=False):
@ -313,6 +314,13 @@ for p in ('host', 'port', 'user', 'password'):
def dsn(db_name):
return '%sdbname=%s' % (_dsn, db_name)
def dsn_are_equals(first, second):
def key(dsn):
k = dict(x.split('=', 1) for x in dsn.strip().split())
k.pop('password', None) # password is not relevant
return k
return key(first) == key(second)
_Pool = ConnectionPool(int(tools.config['db_maxconn']))