diff --git a/lbkit/lbkit/log.py b/lbkit/lbkit/log.py index e4d48e2cc976fc26bfd5eb3b8eb7a60bcc871116..0c032da9ca94d6b6e6a0f7dd7f35163de08f3872 100644 --- a/lbkit/lbkit/log.py +++ b/lbkit/lbkit/log.py @@ -39,7 +39,7 @@ class Logger: retention="30 days", compression="zip", level="DEBUG", - colorize=None + colorize=False ) Logger._lock = False @@ -75,7 +75,7 @@ class Logger: format=format_str, level=level, filter=lambda record: record["level"].no < 40 and "tofile" not in record["extra"], # < ERROR level - colorize=None + colorize=True ) # Add handler for error messages (stderr) @@ -84,7 +84,7 @@ class Logger: format=format_str, level="ERROR", filter= lambda record: "tofile" not in record["extra"], - colorize=None + colorize=True ) Logger._configured = True Logger._lock = False diff --git a/lbkit/lbkit/tools.py b/lbkit/lbkit/tools.py index ab04c820c9e81ff8710bb7c613acd5dc9264ab30..1170c88cafa7e56574b933b1ed21df43659bf672 100644 --- a/lbkit/lbkit/tools.py +++ b/lbkit/lbkit/tools.py @@ -151,7 +151,10 @@ class Tools(object): else: tee.write(show_cmd, True, False) real_cmd = self._real_command(cmd) - result = subprocess.Popen(real_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True, text=True) + env = os.environ.copy() + env["FORCE_COLOR"] = "1" + env["CLICOLOR_FORCE"] = "1" + result = subprocess.Popen(real_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True, text=True, env=env) if result is None: raise errors.RunCommandException(f"Run command {show_cmd} failed") stdout_t = threading.Thread(target=tee.pipe_to_logger, args=(result.stdout, True))