Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-10-01 01:35:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'onion_cleanup_on_stop_server' of https://github.com/mig5/onionshare into mig5-onion_cleanup_on_stop_server

Browse Source
This commit is contained in:
Micah Lee 2018-01-12 18:56:03 -08:00
commit 9eb4131839
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
onionshare/onion.py
View File

@ -415,7 +415,7 @@ class Onion(object):
return onion_host
def cleanup(self):
def cleanup(self, stop_tor=True):
"""
Stop onion services that were created earlier. If there's a tor subprocess running, kill it.
"""
@ -429,18 +429,21 @@ class Onion(object):
pass
self.service_id = None
if stop_tor:
# Stop tor process
if self.tor_proc:
self.tor_proc.terminate()
time.sleep(0.2)
if not self.tor_proc.poll():
try:
self.tor_proc.kill()
except:
pass
self.tor_proc = None
# Reset other Onion settings
self.connected_to_tor = False
self.stealth = False
self.service_id = None
try:
# Delete the temporary tor data directory

2
onionshare_gui/onionshare_gui.py
View File

@ -354,6 +354,8 @@ class OnionShareGui(QtWidgets.QMainWindow):
# Probably we had no port to begin with (Onion service didn't start)
pass
self.app.cleanup()
# Remove ephemeral service, but don't disconnect from Tor
self.onion.cleanup(stop_tor=False)
self.filesize_warning.hide()
self.stop_server_finished.emit()