Merge lp:~florent.x/openobject-server/6.1-bug-905257-fix-reconnect into lp:openobject-server/6.1

[Florent]

This is probably safe to backport in 6.1 branch.

[Olivier Dony (Odoo) (odo-openerp)]

Rejecting this MP for the reasons explained on the trunk one: https://code.launchpad.net/~florent.x/openobject-server/trunk-bug-905257-fix-reconnect/+merge/132149

Unmerged revisions

4297. By Florent on 2012-10-30

[FIX] silently discard closed connection when DB server is restarted.

=== modified file 'openerp/sql_db.py'
--- openerp/sql_db.py	2012-02-06 20:31:51 +0000
+++ openerp/sql_db.py	2012-10-30 16:34:22 +0000
@@ -170,15 +170,25 @@
         # see also the docstring of Cursor.  
         self._serialized = serialized
 
-        self._cnx = pool.borrow(dsn(dbname))
-        self._obj = self._cnx.cursor(cursor_factory=psycopg1cursor)
         if self.sql_log:
             self.__caller = frame_codeinfo(currentframe(),2)
         else:
             self.__caller = False
-        self.__closed = False   # real initialisation value
-        self.autocommit(False)
         self.__closer = False
+        # Ensure connection if the DB server has restarted
+        for idx in xrange(pool._maxconn):
+            self._cnx = pool.borrow(dsn(dbname))
+            self._obj = self._cnx.cursor(cursor_factory=psycopg1cursor)
+            self.__closed = False   # real initialisation value
+            try:
+                self.autocommit(False)
+            except psycopg2.OperationalError:
+                self.__closed = True
+                if not self._cnx.closed:
+                    raise
+                # The closed connection will be discarded from the pool
+            else:
+                break
 
         self._default_log_exceptions = True