From 779075c4a56ef921f4095220725a16b156eba52e Mon Sep 17 00:00:00 2001 From: HelloZeroNet Date: Wed, 2 Mar 2016 09:37:24 +0100 Subject: [PATCH] Rev915, Fix Tor version detection, Better Tor connection error logging --- src/Config.py | 2 +- src/Tor/TorManager.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Config.py b/src/Config.py index 6995ea11..2a21fb73 100644 --- a/src/Config.py +++ b/src/Config.py @@ -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" diff --git a/src/Tor/TorManager.py b/src/Tor/TorManager.py index fc1341c5..0d99c626 100644 --- a/src/Tor/TorManager.py +++ b/src/Tor/TorManager.py @@ -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