From 6e4194a6319941aedc94eb8a677bd1cb4a84ba5a Mon Sep 17 00:00:00 2001 From: Michael Boulton Date: Sun, 9 Dec 2018 19:10:53 +0000 Subject: [PATCH] Make stdout/stderr wrappers identify themselves as not being a tty --- locust/log.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/locust/log.py b/locust/log.py index 5c824f5c18..3ba38829c4 100644 --- a/locust/log.py +++ b/locust/log.py @@ -8,10 +8,10 @@ def setup_logging(loglevel, logfile): numeric_level = getattr(logging, loglevel.upper(), None) if numeric_level is None: raise ValueError("Invalid log level: %s" % loglevel) - + log_format = "[%(asctime)s] {0}/%(levelname)s/%(name)s: %(message)s".format(host) logging.basicConfig(level=numeric_level, filename=logfile, format=log_format) - + sys.stderr = StdErrWrapper() sys.stdout = StdOutWrapper() @@ -25,6 +25,9 @@ class StdOutWrapper(object): def write(self, s): stdout_logger.info(s.strip()) + def isatty(self): + return False + def flush(self, *args, **kwargs): """No-op for wrapper""" pass @@ -36,6 +39,9 @@ class StdErrWrapper(object): def write(self, s): stderr_logger.error(s.strip()) + def isatty(self): + return False + def flush(self, *args, **kwargs): """No-op for wrapper""" pass