Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-04-29 03:36:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
1 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
cli/onionshare_cli/onion.py
View File

@ -749,31 +749,36 @@ class Onion(object):
if stop_tor: if stop_tor:
# Stop tor process # Stop tor process
if self.tor_proc: if self.tor_proc:
rendevouz_circuit_ids = [] # Wait for Tor rendezvous circuits to close
for c in self.c.get_circuits(): # Catch exceptions to prevent crash on Ctrl-C
if c.purpose == "HS_SERVICE_REND": try:
rendevouz_circuit_ids.append(c.id) rendevouz_circuit_ids = []
# print(f"id={c.id} purpose={c.purpose} rend_query={c.rend_query} type={c.type}")
while True:
num_rend_circuits = 0
for c in self.c.get_circuits(): for c in self.c.get_circuits():
if c.id in rendevouz_circuit_ids: if c.purpose == "HS_SERVICE_REND":
num_rend_circuits += 1 rendevouz_circuit_ids.append(c.id)
# print(f"id={c.id} purpose={c.purpose} rend_query={c.rend_query} type={c.type}")
if num_rend_circuits == 0: while True:
print("\rTor rendezvous circuits have closed" + " " * 20) num_rend_circuits = 0
break for c in self.c.get_circuits():
if c.id in rendevouz_circuit_ids:
num_rend_circuits += 1
if num_rend_circuits == 1: if num_rend_circuits == 0:
circuits = "circuit" print("\rTor rendezvous circuits have closed" + " " * 20)
else: break
circuits = "circuits"
print( if num_rend_circuits == 1:
f"\rWaiting for {num_rend_circuits} Tor rendezvous {circuits} to close ... ", circuits = "circuit"
end="", else:
) circuits = "circuits"
time.sleep(1) print(
f"\rWaiting for {num_rend_circuits} Tor rendezvous {circuits} to close ... ",
end="",
)
time.sleep(1)
except:
pass
self.tor_proc.terminate() self.tor_proc.terminate()
time.sleep(0.2) time.sleep(0.2)