oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tormanager only disconnect if connected

Browse source
This commit is contained in:
shortcutme 2019-03-16 00:08:04 +01:00
parent 8220272953
commit fd895d0ef5
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Tor/TorManager.py
View file

@ -37,6 +37,7 @@ class TorManager(object):
self.conn = None self.conn = None
self.lock = RLock() self.lock = RLock()
self.starting = True self.starting = True
self.connecting = True
self.event_started = gevent.event.AsyncResult() self.event_started = gevent.event.AsyncResult()
if config.tor == "disable": if config.tor == "disable":
@ -136,6 +137,7 @@ class TorManager(object):
conn = socket.socket(socket.AF_INET, socket.SOCK_STREAM) conn = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.log.info("Connecting to Tor Controller %s:%s" % (self.ip, self.port)) self.log.info("Connecting to Tor Controller %s:%s" % (self.ip, self.port))
self.connecting = True
try: try:
with self.lock: with self.lock:
conn.connect((self.ip, self.port)) conn.connect((self.ip, self.port))
@ -173,7 +175,8 @@ class TorManager(object):
return self.conn return self.conn
def disconnect(self): def disconnect(self):
self.conn.close() if self.conn:
self.conn.close()
self.conn = None self.conn = None
def startOnions(self): def startOnions(self):
@ -248,9 +251,10 @@ class TorManager(object):
break break
except Exception as err: except Exception as err:
self.log.error("Tor send error: %s, reconnecting..." % err) self.log.error("Tor send error: %s, reconnecting..." % err)
self.disconnect() if not self.connecting:
time.sleep(1) self.disconnect()
self.connect() time.sleep(1)
self.connect()
back = None back = None
if back: if back:
self.log.debug("< %s" % back.strip()) self.log.debug("< %s" % back.strip())