Merge lp:~stefan-opener/therp-backports/6.1-bug-905257-fix-reconnect into lp:therp-backports/server-6.1

[Stefan Rijnhart (Opener)]

This branch is now a verbatim backport of lp:openobject-addons/7.0 -r 4838..4840

[Stefan Rijnhart (Opener) (stefan-opener)]

Setting to 'work in progress' as a simpler patch has been posted here: https://code.launchpad.net/~openerp-dev/openobject-server/7.0-rstcnx-chs

[Stefan Rijnhart (Opener) (stefan-opener)]

Reverted previous fix and applied fix that is now in OpenERP server 7.0

[lp:~stefan-opener/therp-backports/6.1-bug-905257-fix-reconnect]

4299. By Olivier Dony (Odoo) on 2013-02-15

[FIX] sql_db: typo in previous patch for autodetection of closed connections

[Stefan Rijnhart (Opener) (stefan-opener)]

Hi Holger,

thank you for merging. Can you also approve the MP next time?

=== modified file 'openerp/sql_db.py'
--- openerp/sql_db.py	2012-02-06 20:31:51 +0000
+++ openerp/sql_db.py	2013-02-15 16:04:26 +0000
@@ -3,7 +3,7 @@
 #
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
-#    Copyright (C) 2010-2011 OpenERP s.a. (<http://openerp.com>).
+#    Copyright (C) 2010-2013 OpenERP s.a. (<http://openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -386,8 +386,16 @@
     def borrow(self, dsn):
         self._debug('Borrow connection to %r', dsn)
 
-        # free leaked connections
+        # free dead and leaked connections
         for i, (cnx, _) in tools.reverse_enumerate(self._connections):
+            try:
+                cnx.reset()
+            except psycopg2.OperationalError:
+                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()
+
             if cnx.closed:
                 self._connections.pop(i)
                 self._debug('Removing closed connection at index %d: %r', i, cnx.dsn)
 
=== modified file 'setup.py'
--- setup.py	2012-02-07 12:14:11 +0000
+++ setup.py	2013-02-15 16:04:26 +0000
@@ -100,7 +100,7 @@
           'gdata',
           'lxml',
           'mako',
-          'psycopg2',
+          'psycopg2 >= 2.2',
           'pydot',
           'python-dateutil < 2',
           'python-ldap',