ph10 2007/02/14 16:44:22 GMT
Modified files:
exim-src/src exigrep.src
Log:
Exigrep update to allow for pids in log lines had somehow got lost.
Revision Changes Path
1.6 +1 -1 exim/exim-src/src/exigrep.src
Index: exigrep.src
===================================================================
RCS file: /home/cvs/exim/exim-src/src/exigrep.src,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- exigrep.src 7 Feb 2007 12:23:35 -0000 1.5
+++ exigrep.src 14 Feb 2007 16:44:22 -0000 1.6
@@ -1,5 +1,5 @@
#! PERL_COMMAND -w
-# $Cambridge: exim/exim-src/src/exigrep.src,v 1.5 2007/02/07 12:23:35 ph10 Exp $
+# $Cambridge: exim/exim-src/src/exigrep.src,v 1.6 2007/02/14 16:44:22 ph10 Exp $
use strict;
@@ -68,7 +68,7 @@
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
