catch exceptions when cleaning up hidden services

This commit is contained in:
Micah Lee 2015-06-16 12:33:56 -07:00
parent 2e39382126
commit 0350cb3cdc

View File

@ -67,6 +67,8 @@ class OnionShare(object):
self.cleanup_filenames = []
def cleanup(self):
# cleanup hidden service
try:
if self.controller:
# Get fresh hidden services (maybe changed since last time)
# and remove ourselves
@ -80,6 +82,10 @@ class OnionShare(object):
self.controller.set_options(hsdic2list(hsdic))
# Politely close the controller
self.controller.close()
except:
pass
# cleanup files
for filename in self.cleanup_filenames:
if os.path.isfile(filename):
os.remove(filename)