From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Date: Tue, 6 Jul 2021 22:43:17 +0000 (+1200)
Subject: py/samba/logger: respect NO_COLOR env variable
X-Git-Tag: talloc-2.4.0~1189
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ade31017583542aae13aabf819cb9f4fd7bea7b7;p=thirdparty%2Fsamba.git

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>
---

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