Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed #15802 -- pyscopg2 sometimes fail to close the connection when …

…it's already closed by the server, Thanks Rick van Hattem

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16708 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 7c657b241657de6b7551dd3f064abe08478719c7 1 parent 6dc48a7
@HonzaKral HonzaKral authored
Showing with 21 additions and 0 deletions.
  1. +21 −0 django/db/backends/postgresql_psycopg2/base.py
View
21 django/db/backends/postgresql_psycopg2/base.py
@@ -14,6 +14,7 @@
from django.db.backends.postgresql_psycopg2.version import get_version
from django.db.backends.postgresql_psycopg2.introspection import DatabaseIntrospection
from django.utils.safestring import SafeUnicode, SafeString
+from django.utils.log import getLogger
try:
import psycopg2 as Database
@@ -29,6 +30,8 @@
psycopg2.extensions.register_adapter(SafeString, psycopg2.extensions.QuotedString)
psycopg2.extensions.register_adapter(SafeUnicode, psycopg2.extensions.QuotedString)
+logger = getLogger('django.db.backends')
+
class CursorWrapper(object):
"""
A thin wrapper around psycopg2's normal cursor class so that we can catch
@@ -114,6 +117,24 @@ def check_constraints(self, table_names=None):
self.cursor().execute('SET CONSTRAINTS ALL IMMEDIATE')
self.cursor().execute('SET CONSTRAINTS ALL DEFERRED')
+ def close(self):
+ if self.connection is None:
+ return
+
+ try:
+ self.connection.close()
+ self.connection = None
+ except psycopg2.Error:
+ # In some cases (database restart, network connection lost etc...)
+ # the connection to the database is lost without giving Django a
+ # notification. If we don't set self.connection to None, the error
+ # will occur a every request.
+ self.connection = None
+ logger.warning('psycopg2 error while closing the connection.',
+ exc_info=sys.exc_info()
+ )
+ raise
+
def _get_pg_version(self):
if self._pg_version is None:
self._pg_version = get_version(self.connection)

0 comments on commit 7c657b2

Please sign in to comment.
Something went wrong with that request. Please try again.