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

Merge pull request #1498 from radfish/PR--fix-log-warn

Browse source 
Fix issues with log messages related to Tor errors
This commit is contained in:
ZeroNet 2018-08-09 03:26:54 +02:00 committed by GitHub
commit 9298922601
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Tor/TorManager.py
View file

@ -66,7 +66,10 @@ class TorManager(object):
raise Exception("No connection") raise Exception("No connection")
self.log.debug("Tor proxy port %s check ok" % config.tor_proxy) self.log.debug("Tor proxy port %s check ok" % config.tor_proxy)
except Exception, err: except Exception, 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)) 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 self.enabled = False
# Change to self-bundled Tor ports # Change to self-bundled Tor ports
from lib.PySocks import socks from lib.PySocks import socks
@ -213,7 +216,7 @@ class TorManager(object):
except Exception, err: except Exception, err:
self.conn = None self.conn = None
self.setStatus(u"Error (%s)" % str(err).decode("utf8", "ignore")) self.setStatus(u"Error (%s)" % str(err).decode("utf8", "ignore"))
self.log.warning(u"Tor controller connect error: %s" % Debug.formatException(str(err).decode("utf8", "ignore"))) self.log.error(u"Tor controller connect error: %s" % Debug.formatException(str(err).decode("utf8", "ignore")))
self.enabled = False self.enabled = False
return self.conn return self.conn

3
src/main.py
View file

@ -48,9 +48,6 @@ if not os.path.isfile("%s/sites.json" % config.data_dir):
if not os.path.isfile("%s/users.json" % config.data_dir): if not os.path.isfile("%s/users.json" % config.data_dir):
open("%s/users.json" % config.data_dir, "w").write("{}") open("%s/users.json" % config.data_dir, "w").write("{}")
# Setup logging
logging.WARNING = 15 # Don't display warnings if not in debug mode
logging.addLevelName(15, "WARNING")
if config.action == "main": if config.action == "main":
from util import helper from util import helper
log_file_path = "%s/debug.log" % config.log_dir log_file_path = "%s/debug.log" % config.log_dir