Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-06-27 07:50:39 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1330 from SaptakS/chat-socket-fix

Browse source 
Force shutdowns the socket server on closing chat server
This commit is contained in:
Micah Lee 2021-04-25 17:41:41 -04:00 • committed by GitHub
commit 2e44dfbbda
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cli/onionshare_cli/web/web.py
View file

@ -360,13 +360,18 @@ class Web:
# Shutdown the flask service # Shutdown the flask service
try: try:
func = request.environ.get("werkzeug.server.shutdown") 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") raise RuntimeError("Not running with the Werkzeug Server")
func() func()
except: except:
pass pass
self.running = False self.running = False
# If chat, shutdown the socket server
if self.mode == "chat":
self.socketio.stop()
def start(self, port): def start(self, port):
""" """
Start the flask web server. Start the flask web server.