oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rev4090, Remove fs paths from error responses

Browse source
This commit is contained in:
shortcutme 2019-05-02 18:02:56 +02:00
parent 617027eb52
commit 20371895c9
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Config.py
View file

@ -13,7 +13,7 @@ class Config(object):
def __init__(self, argv): def __init__(self, argv):
self.version = "0.7.0" self.version = "0.7.0"
self.rev = 4089 self.rev = 4090
self.argv = argv self.argv = argv
self.action = None self.action = None
self.pending_changes = {} self.pending_changes = {}

7
src/Debug/Debug.py
View file

@ -13,6 +13,12 @@ class Notify(Exception):
return self.message 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"): def formatException(err=None, format="text"):
import traceback import traceback
if type(err) == Notify: if type(err) == Notify:
@ -56,6 +62,7 @@ import logging
import gevent import gevent
import time import time
def testBlock(): def testBlock():
logging.debug("Gevent block checker started") logging.debug("Gevent block checker started")
last_time = time.time() last_time = time.time()

8
src/Ui/UiWebsocket.py
View file

@ -677,7 +677,7 @@ class UiWebsocket(object):
return list(self.site.storage.walk(inner_path)) return list(self.site.storage.walk(inner_path))
except Exception as err: except Exception as err:
self.log.error("fileList %s error: %s" % (inner_path, Debug.formatException(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 # List directories in a directory
def actionDirList(self, to, inner_path): def actionDirList(self, to, inner_path):
@ -685,7 +685,7 @@ class UiWebsocket(object):
return list(self.site.storage.list(inner_path)) return list(self.site.storage.list(inner_path))
except Exception as err: except Exception as err:
self.log.error("dirList %s error: %s" % (inner_path, Debug.formatException(err))) self.log.error("dirList %s error: %s" % (inner_path, Debug.formatException(err)))
return {"error": str(err)} return {"error": Debug.formatExceptionMessage(err)}
# Sql query # Sql query
def actionDbQuery(self, to, query, params=None, wait_for=None): def actionDbQuery(self, to, query, params=None, wait_for=None):
@ -696,7 +696,7 @@ class UiWebsocket(object):
res = self.site.storage.query(query, params) res = self.site.storage.query(query, params)
except Exception as err: # Response the error to client except Exception as err: # Response the error to client
self.log.error("DbQuery error: %s" % err) 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 # Convert result to dict
for row in res: for row in res:
rows.append(dict(row)) rows.append(dict(row))
@ -729,7 +729,7 @@ class UiWebsocket(object):
with gevent.Timeout(timeout): with gevent.Timeout(timeout):
self.site.needFile(inner_path, priority=6) self.site.needFile(inner_path, priority=6)
except Exception as err: except Exception as err:
return self.response(to, {"error": str(err)}) return self.response(to, {"error": Debug.formatExceptionMessage(err)})
return self.response(to, "ok") return self.response(to, "ok")
def actionFileRules(self, to, inner_path, use_my_cert=False, content=None): def actionFileRules(self, to, inner_path, use_my_cert=False, content=None):