Rev915, Fix Tor version detection, Better Tor connection error logging
This commit is contained in:
parent
36d3268cf7
commit
779075c4a5
2 changed files with 3 additions and 3 deletions
|
@ -8,7 +8,7 @@ class Config(object):
|
|||
|
||||
def __init__(self, argv):
|
||||
self.version = "0.3.6"
|
||||
self.rev = 914
|
||||
self.rev = 915
|
||||
self.argv = argv
|
||||
self.action = None
|
||||
self.config_file = "zeronet.conf"
|
||||
|
|
|
@ -151,7 +151,7 @@ class TorManager:
|
|||
conn.connect((self.ip, self.port))
|
||||
res_protocol = self.send("PROTOCOLINFO", conn)
|
||||
|
||||
version = re.search('Tor="([0-9\.]+)"', res_protocol).group(1)
|
||||
version = re.search('Tor="([0-9\.]+)', res_protocol).group(1)
|
||||
# Version 0.2.7.5 required because ADD_ONION support
|
||||
assert int(version.replace(".", "0")) >= 20705, "Tor version >=0.2.7.5 required"
|
||||
|
||||
|
@ -170,7 +170,7 @@ class TorManager:
|
|||
except Exception, err:
|
||||
self.conn = None
|
||||
self.status = "Error (%s)" % err
|
||||
self.log.error("Tor controller connect error: %s" % err)
|
||||
self.log.error("Tor controller connect error: %s" % Debug.formatException(err))
|
||||
self.enabled = False
|
||||
return self.conn
|
||||
|
||||
|
|
Loading…
Reference in a new issue