Log ZeroFrame errors to console
This commit is contained in:
parent
349ee5858f
commit
dff261eb18
1 changed files with 9 additions and 2 deletions
|
@ -329,7 +329,9 @@ class UiWebsocket(object):
|
|||
not site.settings["own"] and
|
||||
self.user.getAuthAddress(self.site.address) not in self.site.content_manager.getValidSigners(inner_path)
|
||||
):
|
||||
self.log.error("SiteSign error: you don't own this site & site owner doesn't allow you to do so.")
|
||||
return self.response(to, {"error": "Forbidden, you can only modify your own sites"})
|
||||
|
||||
if privatekey == "stored": # Get privatekey from sites.json
|
||||
privatekey = self.user.getSiteData(self.site.address).get("privatekey")
|
||||
if not privatekey: # Get privatekey from users.json auth_address
|
||||
|
@ -436,7 +438,7 @@ class UiWebsocket(object):
|
|||
valid_signers = self.site.content_manager.getValidSigners(inner_path)
|
||||
auth_address = self.user.getAuthAddress(self.site.address)
|
||||
if not self.site.settings["own"] and auth_address not in valid_signers:
|
||||
self.log.debug("FileWrite forbidden %s not in %s" % (auth_address, valid_signers))
|
||||
self.log.error("FileWrite forbidden %s not in valid_signers %s" % (auth_address, valid_signers))
|
||||
return self.response(to, {"error": "Forbidden, you can only modify your own files"})
|
||||
|
||||
# Try not to overwrite files currently in sync
|
||||
|
@ -469,6 +471,7 @@ class UiWebsocket(object):
|
|||
|
||||
self.site.storage.write(inner_path, content)
|
||||
except Exception, err:
|
||||
self.log.error("File write error: %s" % Debug.formatException(err))
|
||||
return self.response(to, {"error": "Write error: %s" % Debug.formatException(err)})
|
||||
|
||||
if inner_path.endswith("content.json"):
|
||||
|
@ -486,6 +489,7 @@ class UiWebsocket(object):
|
|||
not self.site.settings["own"] and
|
||||
self.user.getAuthAddress(self.site.address) not in self.site.content_manager.getValidSigners(inner_path)
|
||||
):
|
||||
self.log.error("File delete error: you don't own this site & you are not approved by the owner.")
|
||||
return self.response(to, {"error": "Forbidden, you can only modify your own files"})
|
||||
|
||||
file_info = self.site.content_manager.getFileInfo(inner_path)
|
||||
|
@ -501,6 +505,7 @@ class UiWebsocket(object):
|
|||
try:
|
||||
self.site.storage.delete(inner_path)
|
||||
except Exception, err:
|
||||
self.log.error("File delete error: Exception - %s" % err)
|
||||
return self.response(to, {"error": "Delete error: %s" % err})
|
||||
|
||||
self.response(to, "ok")
|
||||
|
@ -532,6 +537,7 @@ class UiWebsocket(object):
|
|||
raise Exception("Only SELECT query supported")
|
||||
res = self.site.storage.query(query, params)
|
||||
except Exception, err: # Response the error to client
|
||||
self.log.error("DbQuery error: %s" % error)
|
||||
return self.response(to, {"error": str(err)})
|
||||
# Convert result to dict
|
||||
for row in res:
|
||||
|
@ -548,7 +554,7 @@ class UiWebsocket(object):
|
|||
self.site.needFile(inner_path, priority=6)
|
||||
body = self.site.storage.read(inner_path)
|
||||
except Exception, err:
|
||||
self.log.debug("%s fileGet error: %s" % (inner_path, err))
|
||||
self.log.error("%s fileGet error: %s" % (inner_path, err))
|
||||
body = None
|
||||
if body and format == "base64":
|
||||
import base64
|
||||
|
@ -587,6 +593,7 @@ class UiWebsocket(object):
|
|||
else:
|
||||
self.response(to, "Not changed")
|
||||
except Exception, err:
|
||||
self.log.error("CertAdd error: Exception - %s" % err.message)
|
||||
self.response(to, {"error": err.message})
|
||||
|
||||
def cbCertAddConfirm(self, to, domain, auth_type, auth_user_name, cert):
|
||||
|
|
Loading…
Reference in a new issue