saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #31090 from rallytime/bp-30542

Browse source 
Back-port #30542 to 2015.8
This commit is contained in:
Mike Place 2016-02-10 11:06:38 -07:00
commit 482eea9883
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
salt/log/setup.py
View file

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