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

Don't allow run site api calls when site is deleting

Browse source
This commit is contained in:
shortcutme 2020-02-20 17:25:56 +01:00
parent a9c75a3146
commit 9b85d8638d
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Site/Site.py
View file

@ -1059,6 +1059,7 @@ class Site(object):
self.log.info("Deleting site...") self.log.info("Deleting site...")
s = time.time() s = time.time()
self.settings["serving"] = False self.settings["serving"] = False
self.settings["deleting"] = True
self.saveSettings() self.saveSettings()
num_greenlets = self.greenlet_manager.stopGreenlets("Site %s deleted" % self.address) num_greenlets = self.greenlet_manager.stopGreenlets("Site %s deleted" % self.address)
self.worker_manager.running = False self.worker_manager.running = False

3
src/Ui/UiWebsocket.py
View file

@ -216,6 +216,9 @@ class UiWebsocket(object):
else: # Normal command else: # Normal command
func_name = self.getCmdFuncName(cmd) func_name = self.getCmdFuncName(cmd)
func = getattr(self, func_name, None) func = getattr(self, func_name, None)
if self.site.settings.get("deleting"):
return self.response(req["id"], {"error": "Site is deleting"})
if not func: # Unknown command if not func: # Unknown command
return self.response(req["id"], {"error": "Unknown command: %s" % cmd}) return self.response(req["id"], {"error": "Unknown command: %s" % cmd})