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

[REVERT] sql_db: undo eager removal of connections from pool; could skip half the connections and is not strictly required 

Credit to Florent Xicluna for spotting it!

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

bzr revid: odo@openerp.com-20130219102610-ll69qaf3zxem1pxf
This commit is contained in:
Olivier Dony 2013-02-19 11:26:10 +01:00
parent aca48e9438
commit 0240416a13
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openerp/sql_db.py
View File

@ -412,15 +412,15 @@ class ConnectionPool(object):
for i, (cnx, used) in enumerate(self._connections):
if not used and dsn_are_equals(cnx.dsn, dsn):
self._connections.pop(i)
try:
cnx.reset()
except psycopg2.OperationalError:
self._debug('Cannot reset connection at index %d: %r, removing it', i, cnx.dsn)
self._debug('Cannot reset connection at index %d: %r', i, cnx.dsn)
# psycopg2 2.4.4 and earlier do not allow closing a closed connection
if not cnx.closed:
cnx.close()
continue
self._connections.pop(i)
self._connections.append((cnx, True))
self._debug('Existing connection found at index %d', i)