Merge lp:~flacoste/storm/bug-360846 into lp:~launchpad-pqm/storm/devel

[Francis J. Lacoste]

[Francis J. Lacoste (flacoste)]

Hi,

This should fix an important bug that we have that prevents the app servers from reconnecting to the database (and thus forcing a restart).

Since I didn't see tests for the existing ones, I didn't bother adding one.

[Edwin Grubbs (edwin-grubbs)]

Hi Francis,

This looks good.

merge-approved

-Edwin

review: Approve

=== modified file 'storm/databases/postgres.py'
--- storm/databases/postgres.py	2008-06-06 03:00:03 +0000
+++ storm/databases/postgres.py	2009-05-06 21:20:08 +0000
@@ -36,7 +36,7 @@
 from storm.variables import Variable, ListVariable, RawStrVariable
 from storm.database import Database, Connection, Result
 from storm.exceptions import (
-    install_exceptions, DatabaseError, DatabaseModuleError,
+    install_exceptions, DatabaseError, DatabaseModuleError, InterfaceError,
     OperationalError, ProgrammingError, TimeoutError)
 from storm.tracer import TimeoutTracer
 
@@ -285,7 +285,8 @@
                 yield param
 
     def is_disconnection_error(self, exc):
-        if not isinstance(exc, (OperationalError, ProgrammingError)):
+        if not isinstance(
+            exc, (InterfaceError, OperationalError, ProgrammingError)):
             return False
 
         # XXX: 2007-09-17 jamesh
@@ -296,6 +297,7 @@
                 "could not connect to server" in msg or
                 "no connection to the server" in msg or
                 "connection not open" in msg or
+                "connection already closed" in msg or
                 "losed the connection unexpectedly" in msg)