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

Rev915, Fix Tor version detection, Better Tor connection error logging

Browse source
This commit is contained in:
HelloZeroNet 2016-03-02 09:37:24 +01:00
parent 36d3268cf7
commit 779075c4a5
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Config.py
View file

@ -8,7 +8,7 @@ class Config(object):
def __init__(self, argv): def __init__(self, argv):
self.version = "0.3.6" self.version = "0.3.6"
self.rev = 914 self.rev = 915
self.argv = argv self.argv = argv
self.action = None self.action = None
self.config_file = "zeronet.conf" self.config_file = "zeronet.conf"

4
src/Tor/TorManager.py
View file

@ -151,7 +151,7 @@ class TorManager:
conn.connect((self.ip, self.port)) conn.connect((self.ip, self.port))
res_protocol = self.send("PROTOCOLINFO", conn) 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 # Version 0.2.7.5 required because ADD_ONION support
assert int(version.replace(".", "0")) >= 20705, "Tor version >=0.2.7.5 required" assert int(version.replace(".", "0")) >= 20705, "Tor version >=0.2.7.5 required"
@ -170,7 +170,7 @@ class TorManager:
except Exception, err: except Exception, err:
self.conn = None self.conn = None
self.status = "Error (%s)" % err 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 self.enabled = False
return self.conn return self.conn