sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-12-18 08:23:51 +03:00
Code Activity

logger: use color automatically for a tty

Browse Source 
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
This commit is contained in:
Joe Guo
2018-10-24 16:35:50 +13:00
committed by Andrew Bartlett
parent c4bd785ac1
commit 24b1aa9da2
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
python/samba/logger.py
View File

@@ -39,7 +39,7 @@ class ColoredFormatter(logging.Formatter):
def get_samba_logger( def get_samba_logger(
name='samba', stream=sys.stderr, use_color=True, name='samba', stream=sys.stderr,
level=None, verbose=False, quiet=False, level=None, verbose=False, quiet=False,
fmt=('%(levelname)s %(asctime)s pid:%(process)d ' fmt=('%(levelname)s %(asctime)s pid:%(process)d '
'%(pathname)s #%(lineno)d: %(message)s'), '%(pathname)s #%(lineno)d: %(message)s'),
@@ -56,7 +56,10 @@ def get_samba_logger(
logger.setLevel(level) 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) formatter = Formatter(fmt=fmt, datefmt=datefmt)
handler = logging.StreamHandler(stream=stream) handler = logging.StreamHandler(stream=stream)