IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Added NoneType exception handling in settings & server modules while returning json response.

Browse Source
This commit is contained in:
Murtuza Zabuawala 2015-11-13 16:59:16 +00:00 committed by Dave Page
parent fe10994fb9
commit 52b86b6fb4
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
web/pgadmin/browser/server_groups/servers/__init__.py
View File

@ -238,8 +238,13 @@ class ServerNode(NodeView):
success=0, success=0,
errormsg=e.message) errormsg=e.message)
try:
info = traceback.format_exc()
except Exception as e:
info = str(e)
return make_json_response(success=1, return make_json_response(success=1,
info=traceback.format_exc()) info=info)
def update(self, gid, sid): def update(self, gid, sid):
"""Update the server settings""" """Update the server settings"""

15
web/pgadmin/settings/__init__.py
View File

@ -75,9 +75,15 @@ def store(setting=None, value=None):
success = 0 success = 0
errormsg = e.message errormsg = e.message
try:
info = traceback.format_exc()
except Exception as e:
info = str(e)
return make_json_response(success=success, return make_json_response(success=success,
errormsg=errormsg, errormsg=errormsg,
info=traceback.format_exc(), info=info,
result=request.form) result=request.form)
@blueprint.route("/get", methods=['POST']) @blueprint.route("/get", methods=['POST'])
@ -100,7 +106,12 @@ def get(setting=None, default=None):
success = 0 success = 0
errormsg = e.message errormsg = e.message
try:
info = traceback.format_exc()
except Exception as e:
info = str(e)
return make_json_response(success=success, return make_json_response(success=success,
errormsg=errormsg, errormsg=errormsg,
info=traceback.format_exc(), info=info,
result=request.form) result=request.form)