From 24a7c2681962e65a8cb31b1ee1a043e494a97156 Mon Sep 17 00:00:00 2001 From: shortcutme Date: Sat, 28 Apr 2018 21:53:36 +0200 Subject: [PATCH] Fix tor status logging with foreign languages --- src/Tor/TorManager.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Tor/TorManager.py b/src/Tor/TorManager.py index cc64fc3c..6b0157dc 100644 --- a/src/Tor/TorManager.py +++ b/src/Tor/TorManager.py @@ -105,7 +105,7 @@ class TorManager(object): # Terminate on exit atexit.register(self.stopTor) except Exception, err: - self.log.error("Error starting Tor client: %s" % Debug.formatException(err)) + self.log.error(u"Error starting Tor client: %s" % Debug.formatException(str(err).decode("utf8", "ignore"))) self.enabled = False return False @@ -206,8 +206,8 @@ class TorManager(object): self.conn = conn except Exception, err: self.conn = None - self.setStatus(u"Error (%s)" % err) - self.log.warning("Tor controller connect error: %s" % Debug.formatException(err)) + 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.enabled = False return self.conn