Put wait for circuits to close login in a try/except, so Ctrl-C does not cause a crash

This commit is contained in:
Micah Lee 2020-11-27 11:08:58 -08:00
parent 3871fcf5eb
commit 752afcaa3a
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73

View File

@ -749,6 +749,9 @@ class Onion(object):
if stop_tor:
# Stop tor process
if self.tor_proc:
# Wait for Tor rendezvous circuits to close
# Catch exceptions to prevent crash on Ctrl-C
try:
rendevouz_circuit_ids = []
for c in self.c.get_circuits():
if c.purpose == "HS_SERVICE_REND":
@ -774,6 +777,8 @@ class Onion(object):
end="",
)
time.sleep(1)
except:
pass
self.tor_proc.terminate()
time.sleep(0.2)