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

Fix intermittent specified_version_number ValueError issue on restart. Fixes #2983

Browse Source 
Now we try to restore server details like server version number at restart so template paths can be resolved.
This commit is contained in:
Harshal Dhumal 2018-02-20 17:31:13 +00:00 committed by Dave Page
parent c91a597df9
commit 05e91044c7
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1752,6 +1752,8 @@ class ServerManager(object):
res = dict() res = dict()
res['sid'] = self.sid res['sid'] = self.sid
res['ver'] = self.ver
res['sversion'] = self.sversion
if hasattr(self, 'password') and self.password: if hasattr(self, 'password') and self.password:
# If running under PY2 # If running under PY2
if hasattr(self.password, 'decode'): if hasattr(self.password, 'decode'):
@ -1861,6 +1863,20 @@ WHERE db.oid = {0}""".format(did))
Helps restoring to reconnect the auto-connect connections smoothly on Helps restoring to reconnect the auto-connect connections smoothly on
reload/restart of the app server.. reload/restart of the app server..
""" """
# restore server version from flask session if flask server was
# restarted. As we need server version to resolve sql template paths.
self.ver = data.get('ver', None)
self.sversion = data.get('sversion', None)
if self.ver and not self.server_type:
from pgadmin.browser.server_groups.servers.types import ServerType
for st in ServerType.types():
if st.instanceOf(self.ver):
self.server_type = st.stype
self.server_cls = st
break
# Hmm.. we will not honour this request, when I already have # Hmm.. we will not honour this request, when I already have
# connections # connections
if len(self.connections) != 0: if len(self.connections) != 0:
@ -1967,6 +1983,7 @@ WHERE db.oid = {0}""".format(did))
else: else:
managers[self.sid] = updated_mgr managers[self.sid] = updated_mgr
session['__pgsql_server_managers'] = managers session['__pgsql_server_managers'] = managers
session.force_write = True
def utility(self, operation): def utility(self, operation):
""" """