phantom/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-01-10 03:37:28 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Raise error from waitress if not shutdown

Browse source
This commit is contained in:
Saptak S 2023-10-21 18:41:02 +05:30
parent 9f247eddfd
commit b2f0444f57
No known key found for this signature in database
GPG key ID: 7B7F1772C0C6FCBF
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() self.waitress.run()
except Exception as e: 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): def stop(self, port):
""" """
@ -398,6 +399,7 @@ class Web:
def waitress_custom_shutdown(self): def waitress_custom_shutdown(self):
"""Shutdown the Waitress server immediately""" """Shutdown the Waitress server immediately"""
# Code borrowed from https://github.com/Pylons/webtest/blob/4b8a3ebf984185ff4fefb31b4d0cf82682e1fcf7/webtest/http.py#L93-L104 # Code borrowed from https://github.com/Pylons/webtest/blob/4b8a3ebf984185ff4fefb31b4d0cf82682e1fcf7/webtest/http.py#L93-L104
self.waitress.shutdown = True
while self.waitress._map: while self.waitress._map:
triggers = list(self.waitress._map.values()) triggers = list(self.waitress._map.values())
for trigger in triggers: for trigger in triggers: