Exigrep patch to allow it to handle syslog files.

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 2846c96b6e2dcc0c88ac25bf51cac68ad7c614dc..e6104671540dbf65b55daf84df91d059adc1209c 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.183 2005/08/01 13:20:28 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.184 2005/08/01 13:28:30 ph10 Exp $

 
 Change log file for Exim from version 4.21
 -------------------------------------------
 
 Change log file for Exim from version 4.21
 -------------------------------------------


@@ -11,6 +11,8 @@ TK/01 Added the "success_on_redirect" address verification option. See
 
 PH/01 Added support for SQLite, basic code supplied by David Woodhouse.
 
 
 PH/01 Added support for SQLite, basic code supplied by David Woodhouse.
 

+PH/02 Patch to exigrep to allow it to work on syslog lines.
+

 
 Exim version 4.52
 -----------------
 
 Exim version 4.52
 -----------------

diff --git a/src/src/exigrep.src b/src/src/exigrep.src
index e824bb41ca1e7e51d7d985dc8ea1c13050e9ee5a..c6ccbfdc50e3d0115e74108f0fd6c0a241481f39 100644 (file)
--- a/src/src/exigrep.src
+++ b/src/src/exigrep.src
@@ -1,5 +1,5 @@
 #! PERL_COMMAND -w
 #! PERL_COMMAND -w

-# $Cambridge: exim/src/src/exigrep.src,v 1.2 2004/12/21 11:28:38 ph10 Exp $
+# $Cambridge: exim/src/src/exigrep.src,v 1.3 2005/08/01 13:28:30 ph10 Exp $

 
 use strict;
 
 
 use strict;
 


@@ -58,6 +58,11 @@ return $seconds;
 my (%saved, %id_list, $pattern, $queue_time);
 
 sub do_line {
 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} )?)(.*)/;
 
 return unless
   my($date,$entry) = /^(\d{4}-\d\d-\d\d \d\d:\d\d:\d\d (?:[+-]\d{4} )?)(.*)/;