diff options
| author | Douglas Bagnall <douglas.bagnall@catalyst.net.nz> | 2021-07-07 10:43:17 +1200 |
|---|---|---|
| committer | Douglas Bagnall <dbagnall@samba.org> | 2022-09-06 21:12:36 +0000 |
| commit | ade31017583542aae13aabf819cb9f4fd7bea7b7 (patch) | |
| tree | f5dd66ecc8267676ff8a7c7bfbae71b48e4dbc4b /python/samba | |
| parent | a45c76b5cd95ada77905ed5cfc979c5523c84160 (diff) | |
| download | samba-ade31017583542aae13aabf819cb9f4fd7bea7b7.tar.gz samba-ade31017583542aae13aabf819cb9f4fd7bea7b7.tar.bz2 samba-ade31017583542aae13aabf819cb9f4fd7bea7b7.zip | |
py/samba/logger: respect NO_COLOR env variable
As per https://no-color.org/
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Diffstat (limited to 'python/samba')
| -rw-r--r-- | python/samba/logger.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/python/samba/logger.py b/python/samba/logger.py index 667c6487a51..7fb2199e031 100644 --- a/python/samba/logger.py +++ b/python/samba/logger.py @@ -19,6 +19,7 @@ import sys import logging from samba.colour import GREY, YELLOW, GREEN, RED, DARK_RED, C_NORMAL +from samba.colour import is_colour_wanted LEVEL_COLORS = { logging.CRITICAL: DARK_RED, @@ -55,8 +56,7 @@ def get_samba_logger( (quiet and logging.WARNING) or logging.INFO) logger.setLevel(level) - - if (hasattr(stream, 'isatty') and stream.isatty()): + if is_colour_wanted(stream): Formatter = ColoredFormatter else: Formatter = logging.Formatter |