diff options
| author | Joe Guo <joeg@catalyst.net.nz> | 2018-10-24 16:35:50 +1300 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2018-11-21 10:46:20 +0100 |
| commit | 24b1aa9da2e53e0dba89811f6a8d14b810bd48a8 (patch) | |
| tree | 6b0bc6e55ac6a0cc7ce5b7f7255d152f6c6520f7 /python | |
| parent | c4bd785ac12fe80e11e985c8c50e459be4ec9898 (diff) | |
| download | samba-24b1aa9da2e53e0dba89811f6a8d14b810bd48a8.tar.gz | |
logger: use color automatically for a tty
Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Wed Nov 21 10:46:20 CET 2018 on sn-devel-144
Diffstat (limited to 'python')
| -rw-r--r-- | python/samba/logger.py | 7 |
1 files changed, 5 insertions, 2 deletions
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) |