Exigrep update to allow for pids in log lines had somehow got lost.
authorPhilip Hazel <ph10@hermes.cam.ac.uk>
Wed, 14 Feb 2007 16:44:22 +0000 (16:44 +0000)
committerPhilip Hazel <ph10@hermes.cam.ac.uk>
Wed, 14 Feb 2007 16:44:22 +0000 (16:44 +0000)
src/src/exigrep.src

index 7b6360f014b11567101340432c4c33cb2ebb3b37..b0fdbfe1ac2580f5e93dfa9843c6644bca738937 100644 (file)
@@ -1,5 +1,5 @@
 #! PERL_COMMAND -w
-# $Cambridge: exim/src/src/exigrep.src,v 1.5 2007/02/07 12:23:35 ph10 Exp $
+# $Cambridge: exim/src/src/exigrep.src,v 1.6 2007/02/14 16:44:22 ph10 Exp $
 
 use strict;
 
@@ -68,7 +68,7 @@ sub do_line {
 if (!/^\d{4}-/o) { $_ =~ s/^.*? exim\b.*?: //o; }
 
 return unless
-  my($date,$id) = /^(\d{4}-\d\d-\d\d \d\d:\d\d:\d\d (?:[+-]\d{4} )?)(\w{6}\-\w{6}\-\w{2})?/o;
+  my($date,$id) = /^(\d{4}-\d\d-\d\d \d\d:\d\d:\d\d (?:[+-]\d{4} )?)(?:\[\d+\] )?(\w{6}\-\w{6}\-\w{2})?/o;
 
 # Handle the case when the log line belongs to a specific message. We save
 # lines for specific messages until the message is complete. Then either print