From 0d423aaefded8f312c23171dcae078c35b10b6d3 Mon Sep 17 00:00:00 2001 From: Arinerron Date: Sat, 27 Jan 2018 20:43:54 -0800 Subject: [PATCH] Change "error" to "fatal" and fix styling for fatal --- onionr/logger.py | 2 +- onionr/netcontroller.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/onionr/logger.py b/onionr/logger.py index f147f44b..7577a6db 100644 --- a/onionr/logger.py +++ b/onionr/logger.py @@ -195,4 +195,4 @@ def error(data): # fatal: when the something so bad has happened that the prorgam must stop def fatal(data): if get_level() <= LEVEL_FATAL: - log('#', data, colors.bg.red + colors.fg.black) + log('#', data, colors.bg.red + colors.fg.green + colors.bold) diff --git a/onionr/netcontroller.py b/onionr/netcontroller.py index 7c670802..a53d93cc 100644 --- a/onionr/netcontroller.py +++ b/onionr/netcontroller.py @@ -61,7 +61,7 @@ HiddenServicePort 80 127.0.0.1:''' + str(self.hsPort) + ''' try: tor = subprocess.Popen([torBinary, '-f', self.torConfigLocation], stdout=subprocess.PIPE, stderr=subprocess.PIPE) except FileNotFoundError: - logger.error("Tor was not found in your path or the Onionr directory. Install Tor and try again.") + logger.fatal("Tor was not found in your path or the Onionr directory. Please install Tor and try again.") sys.exit(1) # wait for tor to get to 100% bootstrap for line in iter(tor.stdout.readline, b''): @@ -70,7 +70,7 @@ HiddenServicePort 80 127.0.0.1:''' + str(self.hsPort) + ''' elif 'Opening Socks listener' in line.decode(): logger.debug(line.decode()) else: - logger.error('Failed to start Tor. Try killing any other Tor processes owned by this user.') + logger.fatal('Failed to start Tor. Try killing any other Tor processes owned by this user.') return False logger.info('Finished starting Tor') self.readyState = True @@ -94,4 +94,4 @@ HiddenServicePort 80 127.0.0.1:''' + str(self.hsPort) + ''' except: return os.kill(int(pidN), signal.SIGTERM) - os.remove('data/torPid.txt') \ No newline at end of file + os.remove('data/torPid.txt')