Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-12-25 15:29:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1416 from SaptakS/fix-chat-shutdown

Browse Source 
Adds exception for ConnectionError in chat mode during shutdown
This commit is contained in:
Micah Lee 2021-09-03 13:23:43 -07:00 committed by GitHub
commit aac8020c3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cli/onionshare_cli/web/web.py
View File

@ -361,9 +361,18 @@ class Web:
# To stop flask, load http://shutdown:[shutdown_password]@127.0.0.1/[shutdown_password]/shutdown # To stop flask, load http://shutdown:[shutdown_password]@127.0.0.1/[shutdown_password]/shutdown
# (We're putting the shutdown_password in the path as well to make routing simpler) # (We're putting the shutdown_password in the path as well to make routing simpler)
if self.running: if self.running:
requests.get( try:
f"http://127.0.0.1:{port}/{self.shutdown_password}/shutdown" requests.get(
) f"http://127.0.0.1:{port}/{self.shutdown_password}/shutdown"
)
except requests.exceptions.ConnectionError as e:
# The way flask-socketio stops a connection when running using
# eventlet is by raising SystemExit to abort all the processes.
# Hence the connections are closed and no response is returned
# to the above request. So I am just catching the ConnectionError
# to check if it was chat mode, in which case it's okay
if self.mode != "chat":
raise e
def cleanup(self): def cleanup(self):
""" """