From: Philip Hazel <ph10@hermes.cam.ac.uk>
Date: Wed, 14 Feb 2007 16:44:22 +0000 (+0000)
Subject: Exigrep update to allow for pids in log lines had somehow got lost.
X-Git-Tag: exim-4_67~34
X-Git-Url: https://git.exim.org/users/jgh/exim.git/commitdiff_plain/c0997ccb904d2a65990e4e74bf1824864b9186cc?ds=inline

Exigrep update to allow for pids in log lines had somehow got lost.
---

diff --git a/src/src/exigrep.src b/src/src/exigrep.src
index 7b6360f01..b0fdbfe1a 100644
--- a/src/src/exigrep.src
+++ b/src/src/exigrep.src
@@ -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