From 24b1aa9da2e53e0dba89811f6a8d14b810bd48a8 Mon Sep 17 00:00:00 2001 From: Joe Guo Date: Wed, 24 Oct 2018 16:35:50 +1300 Subject: logger: use color automatically for a tty Signed-off-by: Joe Guo Reviewed-by: Andrew Bartlett Reviewed-by: Douglas Bagnall Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Wed Nov 21 10:46:20 CET 2018 on sn-devel-144 --- python/samba/logger.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'python') diff --git a/python/samba/logger.py b/python/samba/logger.py index a3db3beeec8..667c6487a51 100644 --- a/python/samba/logger.py +++ b/python/samba/logger.py @@ -39,7 +39,7 @@ class ColoredFormatter(logging.Formatter): def get_samba_logger( - name='samba', stream=sys.stderr, use_color=True, + name='samba', stream=sys.stderr, level=None, verbose=False, quiet=False, fmt=('%(levelname)s %(asctime)s pid:%(process)d ' '%(pathname)s #%(lineno)d: %(message)s'), @@ -56,7 +56,10 @@ def get_samba_logger( logger.setLevel(level) - Formatter = use_color and ColoredFormatter or logging.Formatter + if (hasattr(stream, 'isatty') and stream.isatty()): + Formatter = ColoredFormatter + else: + Formatter = logging.Formatter formatter = Formatter(fmt=fmt, datefmt=datefmt) handler = logging.StreamHandler(stream=stream) -- cgit v1.2.1