# HG changeset patch # User Tero Marttila # Date 1358020113 -7200 # Node ID 6b27d7010bd4ba1d7241612f7ba482662009c27a # Parent 0f34cf81b9f1e5ad6fd58fc026d2a2b5b18c04c0 pvl.syslog: implement --syslog-severity diff -r 0f34cf81b9f1 -r 6b27d7010bd4 pvl/syslog/args.py --- a/pvl/syslog/args.py Sat Jan 12 21:42:03 2013 +0200 +++ b/pvl/syslog/args.py Sat Jan 12 21:48:33 2013 +0200 @@ -32,6 +32,9 @@ syslog.add_option('--syslog-facility', metavar='FACILITY', help="Set/filter by given facility") + syslog.add_option('--syslog-severity', metavar='SEVERITY', + help="Set given facility") + syslog.add_option('--syslog-prog', metavar='PROG', default=prog, help="Filter by given prog: %default") @@ -74,12 +77,14 @@ parser = SyslogParser( raw = options.syslog_raw, facility = options.syslog_facility, + severity = options.syslog_severity, ) filter = SyslogFilter( # glob pattern prog = options.syslog_prog, facility = options.syslog_facility, + #severity = options.sylog_severity, # XXX: match as greater-than? ) # polling diff -r 0f34cf81b9f1 -r 6b27d7010bd4 pvl/syslog/parser.py --- a/pvl/syslog/parser.py Sat Jan 12 21:42:03 2013 +0200 +++ b/pvl/syslog/parser.py Sat Jan 12 21:48:33 2013 +0200 @@ -119,13 +119,14 @@ + r"(?P(?P(?P[^:\]]+)(?:\[(?P\d+)\])?: )?(?P.*))\n?" ) - def __init__ (self, raw=False, facility=None) : + def __init__ (self, raw=False, facility=None, severity=None) : """ - Using given underlying line source. + Using given facility/severity as default. """ self.raw = raw self.facility = facility + self.severity = severity def parse_pri (self, match) : """ @@ -134,7 +135,7 @@ pri = match.group('pri') facility = match.group('facility') or self.facility - severity = match.group('severity') + severity = match.group('severity') or self.severity if pri and pri.isdigit() : pri = int(pri)