X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fsrc%2Fexigrep.src;h=c6ccbfdc50e3d0115e74108f0fd6c0a241481f39;hb=2d280592a7f859d1e06738d86c3bc43382f1b791;hp=bcd35973592ce26c3528dbb701e0fc9b1acb7cb7;hpb=059ec3d9952740285fb1ebf47961b8aca2eb1b4a;p=exim.git

diff --git a/src/src/exigrep.src b/src/src/exigrep.src
index bcd359735..c6ccbfdc5 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.1 2004/10/07 10:39:01 ph10 Exp $
+# $Cambridge: exim/src/src/exigrep.src,v 1.3 2005/08/01 13:28:30 ph10 Exp $
 
 use strict;
 
@@ -58,6 +58,11 @@ return $seconds;
 my (%saved, %id_list, $pattern, $queue_time);
 
 sub do_line {
+
+# Convert syslog lines to mainlog format, as in eximstats.
+
+if (! /^\\d{4}/) { $_ =~ s/^.*? exim\b.*?: //; }
+
 return unless
   my($date,$entry) = /^(\d{4}-\d\d-\d\d \d\d:\d\d:\d\d (?:[+-]\d{4} )?)(.*)/;
 
@@ -81,7 +86,7 @@ if (my($id) = $entry =~ /^(\w{6}\-\w{6}\-\w{2})/)
   # print it, but in any event, throw away what was saved.
 
   if ($entry =~
-        /(?:Completed$|rejected (?:by local_scan|by non-SMTP ACL|after DATA))/)
+        /(?:Completed|rejected (?:by local_scan|by non-SMTP ACL|after DATA))/)
     {
     if ($saved{$id} =~ /^(\d{4}-\d\d-\d\d \d\d:\d\d:\d\d ([+-]\d{4} )?)(\w{6}\-\w{6}\-\w{2})/)
       {