openerp-community-reviewer team mailing list archive

["Cedric Le Brouster\(OpenFire\)" <cedric.lebrouster@xxxxxxxxxxx>]

Cedric Le Brouster(OpenFire) has proposed merging lp:~cedric-lebrouster/ocb-server/ocb-7.0-bug-1322191-db_maxconn into lp:ocb-server.

Requested reviews:
  OpenERP Community Backports (ocb)
Related bugs:
  Bug #1322191 in OpenERP Server: "db_maxconn config parameter doesn't work"
  https://bugs.launchpad.net/openobject-server/+bug/1322191

For more details, see:
https://code.launchpad.net/~cedric-lebrouster/ocb-server/ocb-7.0-bug-1322191-db_maxconn/+merge/220666

Close database connections before removing them.
Fixes bug lp:1322191
-- 
https://code.launchpad.net/~cedric-lebrouster/ocb-server/ocb-7.0-bug-1322191-db_maxconn/+merge/220666
Your team OpenERP Community Backports is requested to review the proposed merge of lp:~cedric-lebrouster/ocb-server/ocb-7.0-bug-1322191-db_maxconn into lp:ocb-server.

=== modified file 'openerp/sql_db.py'
--- openerp/sql_db.py	2014-04-09 15:16:59 +0000
+++ openerp/sql_db.py	2014-05-22 14:50:38 +0000
@@ -430,6 +430,8 @@
             for i, (cnx, used) in enumerate(self._connections):
                 if not used:
                     self._connections.pop(i)
+                    if not cnx.closed:
+                        cnx.close()
                     self._debug('Removing old connection at index %d: %r', i, cnx.dsn)
                     break
             else: