mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Some 3rd-party modules (e.g. gnupg) define custom log levels that emit
at INFO level and above. This patch sets the color data lookups to default to TextFormat('reset') rather than producing a stack trace every time a log message is generated from an affected module.
This commit is contained in:
parent
8704750cf9
commit
67a713f2f6
1 changed files with 5 additions and 4 deletions
|
@ -146,19 +146,20 @@ class SaltColorLogRecord(logging.LogRecord):
|
|||
logging.LogRecord.__init__(self, *args, **kwargs)
|
||||
reset = TextFormat('reset')
|
||||
|
||||
clevel = LOG_COLORS['levels'].get(self.levelname, reset)
|
||||
cmsg = LOG_COLORS['msgs'].get(self.levelname, reset)
|
||||
|
||||
# pylint: disable=E1321
|
||||
self.colorname = '%s[%-17s]%s' % (LOG_COLORS['name'],
|
||||
self.name,
|
||||
reset)
|
||||
self.colorlevel = '%s[%-8s]%s' % (LOG_COLORS['levels'][self.levelname],
|
||||
self.colorlevel = '%s[%-8s]%s' % (clevel,
|
||||
self.levelname,
|
||||
TextFormat('reset'))
|
||||
self.colorprocess = '%s[%5s]%s' % (LOG_COLORS['process'],
|
||||
self.process,
|
||||
reset)
|
||||
self.colormsg = '%s%s%s' % (LOG_COLORS['msgs'][self.levelname],
|
||||
self.msg,
|
||||
reset)
|
||||
self.colormsg = '%s%s%s' % (cmsg, self.msg, reset)
|
||||
# pylint: enable=E1321
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue