From 7ee8cd8f5ea609a8bef1153fdf85c15a2b5abcc3 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 8 May 2014 17:07:44 +0200 Subject: Another Variant for detecting if a connection is closed If there is a closed attribute on the connection and it is true, return true. Implements a todo in the code and helps in one specific disconnect case where it previously did not match because the error message was "unknown error". --- lib/sqlalchemy/dialects/postgresql/psycopg2.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/sqlalchemy/dialects/postgresql/psycopg2.py b/lib/sqlalchemy/dialects/postgresql/psycopg2.py index c4f7c032d..5acba8aba 100644 --- a/lib/sqlalchemy/dialects/postgresql/psycopg2.py +++ b/lib/sqlalchemy/dialects/postgresql/psycopg2.py @@ -489,12 +489,16 @@ class PGDialect_psycopg2(PGDialect): def is_disconnect(self, e, connection, cursor): if isinstance(e, self.dbapi.Error): + # Is the connection already marked as closed? + if getattr(connection, 'closed', False): + return True + str_e = str(e).partition("\n")[0] for msg in [ # these error messages from libpq: interfaces/libpq/fe-misc.c # and interfaces/libpq/fe-secure.c. # TODO: these are sent through gettext in libpq and we can't - # check within other locales - consider using connection.closed + # check within other locales 'terminating connection', 'closed the connection', 'connection not open', -- cgit v1.2.1