From a4ae37d203a87cb6c07a676a02679d6d13164dfe Mon Sep 17 00:00:00 2001 From: Saptak S Date: Mon, 19 Apr 2021 02:59:22 +0530 Subject: Force shutdowns the socket server on closing chat server --- cli/onionshare_cli/web/web.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'cli') diff --git a/cli/onionshare_cli/web/web.py b/cli/onionshare_cli/web/web.py index 7408046b..ab47195c 100644 --- a/cli/onionshare_cli/web/web.py +++ b/cli/onionshare_cli/web/web.py @@ -360,13 +360,18 @@ class Web: # Shutdown the flask service try: func = request.environ.get("werkzeug.server.shutdown") - if func is None: + if func is None and self.mode != "chat": raise RuntimeError("Not running with the Werkzeug Server") func() except: pass + self.running = False + # If chat, shutdown the socket server + if self.mode == "chat": + self.socketio.stop() + def start(self, port): """ Start the flask web server. -- cgit v1.2.3-54-g00ecf