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

Display more detailed info on content sign error

Browse source
This commit is contained in:
shortcutme 2018-03-18 21:27:04 +01:00
parent adf39b6f6a
commit ccdfe77356
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/Ui/UiWebsocket.py
View file

@ -16,7 +16,7 @@ from util import QueryJson, RateLimit
from Plugin import PluginManager from Plugin import PluginManager
from Translate import translate as _ from Translate import translate as _
from util import helper from util import helper
from Content.ContentManager import VerifyError, SignError
@PluginManager.acceptPlugins @PluginManager.acceptPlugins
class UiWebsocket(object): class UiWebsocket(object):
@ -403,11 +403,16 @@ class UiWebsocket(object):
# Sign using private key sent by user # Sign using private key sent by user
try: try:
signed = site.content_manager.sign(inner_path, privatekey, extend=extend, update_changed_files=update_changed_files, remove_missing_optional=remove_missing_optional) signed = site.content_manager.sign(inner_path, privatekey, extend=extend, update_changed_files=update_changed_files, remove_missing_optional=remove_missing_optional)
except Exception, err: except (VerifyError, SignError) as err:
self.cmd("notification", ["error", _["Content signing failed"] + "<br><small>%s</small>" % err]) self.cmd("notification", ["error", _["Content signing failed"] + "<br><small>%s</small>" % err])
self.response(to, {"error": "Site sign failed: %s" % err}) self.response(to, {"error": "Site sign failed: %s" % err})
self.log.error("Site sign failed: %s: %s" % (inner_path, Debug.formatException(err))) self.log.error("Site sign failed: %s: %s" % (inner_path, Debug.formatException(err)))
return return
except Exception as err:
self.cmd("notification", ["error", _["Content signing error"] + "<br><small>%s</small>" % Debug.formatException(err)])
self.response(to, {"error": "Site sign error: %s" % Debug.formatException(err)})
self.log.error("Site sign error: %s: %s" % (inner_path, Debug.formatException(err)))
return
site.content_manager.loadContent(inner_path, add_bad_files=False) # Load new content.json, ignore errors site.content_manager.loadContent(inner_path, add_bad_files=False) # Load new content.json, ignore errors