Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-01-13 16:29:31 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make sure tor process is killed in a more robust manner, and also increase tor connection timeout to 45 seconds

Browse Source
This commit is contained in:
Micah Lee 2017-04-15 11:43:19 -07:00
parent 0ddcda1570
commit e4cdfa6c99
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
onionshare/onion.py
View File

@ -136,7 +136,7 @@ class Onion(object):
(self.tor_path, self.tor_geo_ip_file_path, self.tor_geo_ipv6_file_path) = helpers.get_tor_paths()
# The tor process
self.tor_p = None
self.tor_proc = None
# Try to connect to Tor
self.c = None
@ -215,8 +215,8 @@ class Onion(object):
break
time.sleep(0.2)
# Timeout after 30 seconds
if time.time() - start_ts > 30:
# Timeout after 45 seconds
if time.time() - start_ts > 45:
print("")
self.tor_proc.terminate()
raise BundledTorTimeout(strings._('settings_error_bundled_tor_timeout'))
@ -387,6 +387,9 @@ class Onion(object):
# Stop tor process
if self.tor_proc:
self.tor_proc.terminate()
time.sleep(0.2)
if not self.tor_proc.poll():
self.tor_proc.kill()
self.tor_proc = None
def _get_available_port(self):