Merge lp:~james-w/storm/ssl-disconnect-error into lp:storm

[James Westby]

Close the connection if there is a SSL connection closed error.

Hi,

We're seeing "OperationalError: SSL connection has been closed unexpectedly"
which is fatal to the connection, so add it to the list of disconnection errors.

Thanks,

James

Unmerged revisions

466. By James Westby on 2013-10-02

Close the connection if there is a SSL connection closed error.

=== modified file 'storm/databases/postgres.py'
--- storm/databases/postgres.py	2012-04-04 23:44:02 +0000
+++ storm/databases/postgres.py	2013-10-02 21:35:37 +0000
@@ -316,6 +316,7 @@
                     return True
             msg = str(exc)
             return (
+                "SSL connection has been closed unexpectedly" in msg or
                 "SSL SYSCALL error" in msg or
                 "EOF detected" in msg or
                 "connection already closed" in msg or
 
=== modified file 'tests/databases/postgres.py'
--- tests/databases/postgres.py	2012-06-12 10:00:51 +0000
+++ tests/databases/postgres.py	2013-10-02 21:35:37 +0000
@@ -28,7 +28,8 @@
 from storm.variables import DateTimeVariable, RawStrVariable
 from storm.variables import ListVariable, IntVariable, Variable
 from storm.properties import Int
-from storm.exceptions import DisconnectionError
+from storm.exceptions import (
+    DisconnectionError, OperationalError)
 from storm.expr import (Union, Select, Insert, Update, Alias, SQLRaw, State,
                         Sequence, Like, Column, COLUMN)
 from storm.tracer import install_tracer, TimeoutError
@@ -579,6 +580,15 @@
         exc = ProgrammingError("SSL SYSCALL error: Connection timed out")
         self.assertTrue(self.connection.is_disconnection_error(exc))
 
+    def test_is_disconnection_error_with_ssl_connection_closed(self):
+        """
+        If the underlying driver raises a OperationalError with 'SSL
+        connection has been closed unexpectedly', we consider the connection
+        dead and mark it as needing reconnection.
+        """
+        exc = OperationalError("SSL connection has been closed unexpectedly")
+        self.assertTrue(self.connection.is_disconnection_error(exc))
+
 
 _max_prepared_transactions = None