summaryrefslogtreecommitdiffstats
path: root/filter.py
diff options
context:
space:
mode:
authorJan Pokorný <jpokorny@redhat.com>2015-12-08 15:28:22 +0100
committerJan Pokorný <jpokorny@redhat.com>2015-12-17 23:36:38 +0100
commit44e87afba2ebcc322eda78c5d7bb6e0bb034b66a (patch)
tree9065a8bcfe7f0c7a5c368f6f2f47ec0bdcd376f7 /filter.py
parentffff8310358152292ab4599983e45a2910ded684 (diff)
downloadclufter-44e87afba2ebcc322eda78c5d7bb6e0bb034b66a.tar.gz
clufter-44e87afba2ebcc322eda78c5d7bb6e0bb034b66a.tar.xz
clufter-44e87afba2ebcc322eda78c5d7bb6e0bb034b66a.zip
filter: XMLFilter: adapt highlighter to support "NOTE:"
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
Diffstat (limited to 'filter.py')
-rw-r--r--filter.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/filter.py b/filter.py
index 386bb33..5135455 100644
--- a/filter.py
+++ b/filter.py
@@ -537,11 +537,17 @@ class XMLFilter(Filter, MetaPlugin):
urgent = (ret is None and not(emsg.split(' ', 1)[0].isupper())
or entry.type != 0)
emsg = emsg if not urgent else 'FATAL: ' + emsg
+ emsg = cls._re_highlight.sub('\g<lp>|highlight:\g<msg>|\g<rp>',
+ emsg)
msg = "|header:[{0:{1}}]| |subheader:XSLT:| {2}".format(cls.name,
maxl, emsg)
svc_output(msg, urgent=urgent,
- base=emsg.startswith('WARNING:') and 'warning'
- or urgent and 'error')
+ base=reduce(
+ lambda now, (new, new_l):
+ now or (emsg.startswith(new) and new_l),
+ {'WARNING:': 'warning', 'NOTE:': 'note'}.iteritems(),
+ ''
+ ) or urgent and 'error')
if urgent:
fatal.append("XSLT: " + entry.message)
if not fatal and validate_hook: