diff options
| author | Micah Lee <micah@micahflee.com> | 2020-11-27 11:08:58 -0800 |
|---|---|---|
| committer | Micah Lee <micah@micahflee.com> | 2020-11-27 11:08:58 -0800 |
| commit | 752afcaa3a62785296d06baeb44ba00a4f30ad46 (patch) | |
| tree | 676f16d072910ef53d666b623e2239083336a3b9 | |
| parent | 3871fcf5ebad4c6645ca238a9c7bf21219b9c292 (diff) | |
| download | onionshare-752afcaa3a62785296d06baeb44ba00a4f30ad46.tar.gz onionshare-752afcaa3a62785296d06baeb44ba00a4f30ad46.zip | |
Put wait for circuits to close login in a try/except, so Ctrl-C does not cause a crash
| -rw-r--r-- | cli/onionshare_cli/onion.py | 53 |
1 files changed, 29 insertions, 24 deletions
diff --git a/cli/onionshare_cli/onion.py b/cli/onionshare_cli/onion.py index c6862a4f..f10401da 100644 --- a/cli/onionshare_cli/onion.py +++ b/cli/onionshare_cli/onion.py @@ -749,31 +749,36 @@ class Onion(object): if stop_tor: # Stop tor process if self.tor_proc: - rendevouz_circuit_ids = [] - for c in self.c.get_circuits(): - if c.purpose == "HS_SERVICE_REND": - rendevouz_circuit_ids.append(c.id) - # print(f"id={c.id} purpose={c.purpose} rend_query={c.rend_query} type={c.type}") - - while True: - num_rend_circuits = 0 + # 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.id in rendevouz_circuit_ids: - num_rend_circuits += 1 - - if num_rend_circuits == 0: - print("\rTor rendezvous circuits have closed" + " " * 20) - break - - if num_rend_circuits == 1: - circuits = "circuit" - else: - circuits = "circuits" - print( - f"\rWaiting for {num_rend_circuits} Tor rendezvous {circuits} to close ... ", - end="", - ) - time.sleep(1) + if c.purpose == "HS_SERVICE_REND": + rendevouz_circuit_ids.append(c.id) + # 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(): + if c.id in rendevouz_circuit_ids: + num_rend_circuits += 1 + + if num_rend_circuits == 0: + print("\rTor rendezvous circuits have closed" + " " * 20) + break + + if num_rend_circuits == 1: + circuits = "circuit" + else: + circuits = "circuits" + print( + f"\rWaiting for {num_rend_circuits} Tor rendezvous {circuits} to close ... ", + end="", + ) + time.sleep(1) + except: + pass self.tor_proc.terminate() time.sleep(0.2) |