Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-10-01 01:35:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1790 from onionshare/fix-waitress-stop-error

Browse Source 
Raise error from waitress if not shutdown
This commit is contained in:
mig5 2023-10-23 14:45:39 +11:00 committed by GitHub
commit f880a931bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -365,7 +365,8 @@ class Web:
)
self.waitress.run()
except Exception as e:
raise WaitressException(f"Error starting Waitress: {e}")
if not self.waitress.shutdown:
raise WaitressException(f"Error starting Waitress: {e}")
def stop(self, port):
"""
@ -398,6 +399,7 @@ class Web:
def waitress_custom_shutdown(self):
"""Shutdown the Waitress server immediately"""
# Code borrowed from https://github.com/Pylons/webtest/blob/4b8a3ebf984185ff4fefb31b4d0cf82682e1fcf7/webtest/http.py#L93-L104
self.waitress.shutdown = True
while self.waitress._map:
triggers = list(self.waitress._map.values())
for trigger in triggers: