From 9bd10d5102d9bf1c778a74bf8d81e7ba4df336bb Mon Sep 17 00:00:00 2001 From: redfish Date: Thu, 2 Aug 2018 23:47:24 +0000 Subject: [PATCH] TorManager: correct the Tor error log message On Linux, there is no self-bundled Tor, so the message was not correct because it was stating that self-bundled Tor was being started. --- src/Tor/TorManager.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Tor/TorManager.py b/src/Tor/TorManager.py index 4794fb32..c629b7b3 100644 --- a/src/Tor/TorManager.py +++ b/src/Tor/TorManager.py @@ -66,7 +66,10 @@ class TorManager(object): raise Exception("No connection") self.log.debug("Tor proxy port %s check ok" % config.tor_proxy) except Exception, err: - self.log.info(u"Starting self-bundled Tor, due to Tor proxy port %s check error: %s" % (config.tor_proxy, err)) + if sys.platform.startswith("win"): + self.log.info(u"Starting self-bundled Tor, due to Tor proxy port %s check error: %s" % (config.tor_proxy, err)) + else: + self.log.info(u"Disabling Tor, because error while accessing Tor proxy at port %s: %s" % (config.tor_proxy, err)) self.enabled = False # Change to self-bundled Tor ports from lib.PySocks import socks