--- a/bin/pvl.verkko-syslog	Thu Jan 03 13:06:30 2013 +0200
+++ b/bin/pvl.verkko-syslog	Thu Jan 03 13:14:29 2013 +0200
@@ -46,10 +46,18 @@
 
 sudo = pvl.syslog.rule.SyslogRule('sudo',
     program = 'sudo',
-    pattern = r'\s*(?P<login>\S+) : TTY=(?P<tty>\S+) ; PWD=(?P<pwd>.+?) ; USER=(?P<user>\S+) ; (?:ENV=(?P<env>.+?) ; )?COMMAND=(?P<command>.*)',
-    format  = "{login}:{tty} - {user}@{host}:{pwd} - {env}{command!r}",
+    pattern = r'\s*(?P<login>\S+) : TTY=(?P<tty>\S+) ; PWD=(?P<pwd>.+?) ; USER=(?P<user>\S+) ; COMMAND=(?P<command>.*)',
+    format  = "{login}:{tty} - {user}@{host}:{pwd} - {command!r}",
 )
 
+sudo_env = pvl.syslog.rule.SyslogRule('sudo',
+    program = 'sudo',
+    pattern = r'\s*(?P<login>\S+) : TTY=(?P<tty>\S+) ; PWD=(?P<pwd>.+?) ; USER=(?P<user>\S+) ; ENV=(?P<env>.+?) ; COMMAND=(?P<command>.*)',
+    format  = "{login}:{tty} - {user}@{host}:{pwd} - {env} {command!r}",
+)
+
+rules = pvl.syslog.rule.SyslogRules((sudo_env, sudo))
+
 def main (argv) :
     options, args = parse_options(argv)
     
@@ -57,8 +65,8 @@
   
     log.info("Start processing syslog messages...")
 
-    for item in syslog.loop() :
-        print sudo.apply(item)
+    for tag, line in rules.process(syslog.loop()) :
+        print tag, line
     
     # done
     log.info("Exiting...")