0x2620/openmedialibrary
1
0
Fork 0
Code Issues 131 Pull requests Releases Wiki Activity

dont unpublish hs

Browse source
This commit is contained in:
j 2016-01-02 15:08:08 +05:30
parent 472d37dc01
commit 9b2c76e464
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
oml/tor.py
View file

@ -72,13 +72,15 @@ DirReqStatistics 0
self._status.append('No tor binary found. Please install TorBrowser or tor') self._status.append('No tor binary found. Please install TorBrowser or tor')
else: else:
cmd = [tor, '--defaults-torrc', defaults, '-f', torrc] cmd = [tor, '--defaults-torrc', defaults, '-f', torrc]
self.p = subprocess.Popen(cmd, stdout=subprocess.PIPE, bufsize=1, universal_newlines=True) self.p = subprocess.Popen(cmd,
stdout=subprocess.PIPE, bufsize=1, universal_newlines=True, close_fds=True)
for line in self.p.stdout: for line in self.p.stdout:
self._status.append(line) self._status.append(line)
logger.debug(line) logger.debug(line)
self.p = None self.p = None
def shutdown(self): def shutdown(self):
print('kill tor')
if self.p: if self.p:
self.p.kill() self.p.kill()
@ -151,7 +153,7 @@ class Tor(object):
def shutdown(self): def shutdown(self):
self._shutdown = True self._shutdown = True
try: try:
self.unpublish() #self.unpublish()
if self.controller: if self.controller:
#self.controller.remove_event_listener(self.connection_change) #self.controller.remove_event_listener(self.connection_change)
self.controller.close() self.controller.close()
@ -190,7 +192,10 @@ class Tor(object):
if not self.connected: if not self.connected:
return False return False
if self.controller: if self.controller:
self.controller.remove_hidden_service(self.dir) try:
self.controller.remove_hidden_service(self.dir)
except:
logger.debug('self.controller.remove_hidden_service fail', exc_info=1)
state.online = False state.online = False
def is_online(self): def is_online(self):