IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-01-28 17:24:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

Only reconnect to databases that were previously connected. Fixes #2292

Browse Source
This commit is contained in:
Harshal Dhumal 2017-05-08 12:36:51 +01:00 committed by Dave Page
parent 94b7fc483a
commit a80f760933
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
web/pgadmin/utils/driver/psycopg2/__init__.py
View File

@ -226,6 +226,7 @@ class Connection(BaseConnection):
res['conn_id'] = self.conn_id
res['database'] = self.db
res['async'] = self.async
res['wasConnected'] = self.wasConnected
return res
@ -1565,15 +1566,18 @@ WHERE db.oid = {0}""".format(did))
self, conn_info['conn_id'], conn_info['database'],
True, conn_info['async']
)
try:
conn.connect(
password=data['password'],
server_types=ServerType.types()
)
except Exception as e:
current_app.logger.exception(e)
self.connections.pop(conn_info['conn_id'])
# only try to reconnect if connection was connected previously.
if conn_info['wasConnected']:
try:
conn.connect(
password=data['password'],
server_types=ServerType.types()
)
# This will also update wasConnected flag in connection so
# no need to update the flag manually.
except Exception as e:
current_app.logger.exception(e)
self.connections.pop(conn_info['conn_id'])
def release(self, database=None, conn_id=None, did=None):
if did is not None: