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

ZeroNetX · Feb 20, 2020 · 9b85d86 · 9b85d86
1 parent a9c75a3
commit 9b85d86
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/Site/Site.py b/src/Site/Site.py
@@ -1059,6 +1059,7 @@ def delete(self):
         self.log.info("Deleting site...")
         s = time.time()
         self.settings["serving"] = False
+        self.settings["deleting"] = True
         self.saveSettings()
         num_greenlets = self.greenlet_manager.stopGreenlets("Site %s deleted" % self.address)
         self.worker_manager.running = False

diff --git a/src/Ui/UiWebsocket.py b/src/Ui/UiWebsocket.py
@@ -216,6 +216,9 @@ def handleRequest(self, req):
         else:  # Normal command
             func_name = self.getCmdFuncName(cmd)
             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
                 return self.response(req["id"], {"error": "Unknown command: %s" % cmd})