Rev4090, Remove fs paths from error responses
This commit is contained in:
parent
617027eb52
commit
20371895c9
3 changed files with 12 additions and 5 deletions
|
@ -13,7 +13,7 @@ class Config(object):
|
|||
|
||||
def __init__(self, argv):
|
||||
self.version = "0.7.0"
|
||||
self.rev = 4089
|
||||
self.rev = 4090
|
||||
self.argv = argv
|
||||
self.action = None
|
||||
self.pending_changes = {}
|
||||
|
|
|
@ -13,6 +13,12 @@ class Notify(Exception):
|
|||
return self.message
|
||||
|
||||
|
||||
def formatExceptionMessage(err):
|
||||
err_type = err.__class__.__name__
|
||||
err_message = str(err.args[-1])
|
||||
return "%s: %s" % (err_type, err_message)
|
||||
|
||||
|
||||
def formatException(err=None, format="text"):
|
||||
import traceback
|
||||
if type(err) == Notify:
|
||||
|
@ -56,6 +62,7 @@ import logging
|
|||
import gevent
|
||||
import time
|
||||
|
||||
|
||||
def testBlock():
|
||||
logging.debug("Gevent block checker started")
|
||||
last_time = time.time()
|
||||
|
|
|
@ -677,7 +677,7 @@ class UiWebsocket(object):
|
|||
return list(self.site.storage.walk(inner_path))
|
||||
except Exception as err:
|
||||
self.log.error("fileList %s error: %s" % (inner_path, Debug.formatException(err)))
|
||||
return {"error": str(err)}
|
||||
return {"error": Debug.formatExceptionMessage(err)}
|
||||
|
||||
# List directories in a directory
|
||||
def actionDirList(self, to, inner_path):
|
||||
|
@ -685,7 +685,7 @@ class UiWebsocket(object):
|
|||
return list(self.site.storage.list(inner_path))
|
||||
except Exception as err:
|
||||
self.log.error("dirList %s error: %s" % (inner_path, Debug.formatException(err)))
|
||||
return {"error": str(err)}
|
||||
return {"error": Debug.formatExceptionMessage(err)}
|
||||
|
||||
# Sql query
|
||||
def actionDbQuery(self, to, query, params=None, wait_for=None):
|
||||
|
@ -696,7 +696,7 @@ class UiWebsocket(object):
|
|||
res = self.site.storage.query(query, params)
|
||||
except Exception as err: # Response the error to client
|
||||
self.log.error("DbQuery error: %s" % err)
|
||||
return self.response(to, {"error": str(err)})
|
||||
return self.response(to, {"error": Debug.formatExceptionMessage(err)})
|
||||
# Convert result to dict
|
||||
for row in res:
|
||||
rows.append(dict(row))
|
||||
|
@ -729,7 +729,7 @@ class UiWebsocket(object):
|
|||
with gevent.Timeout(timeout):
|
||||
self.site.needFile(inner_path, priority=6)
|
||||
except Exception as err:
|
||||
return self.response(to, {"error": str(err)})
|
||||
return self.response(to, {"error": Debug.formatExceptionMessage(err)})
|
||||
return self.response(to, "ok")
|
||||
|
||||
def actionFileRules(self, to, inner_path, use_my_cert=False, content=None):
|
||||
|
|
Loading…
Reference in a new issue