ph10 2005/08/01 14:28:30 BST
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src exigrep.src
exim-test-orig/AutoTest/stderr 904
Log:
Exigrep patch to allow it to handle syslog files.
Revision Changes Path
1.184 +2 -0 exim/exim-doc/doc-txt/ChangeLog
1.3 +5 -0 exim/exim-src/src/exigrep.src
1.4 +1 -1 exim/exim-test-orig/AutoTest/stderr/904
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- ChangeLog 1 Aug 2005 13:20:28 -0000 1.183
+++ ChangeLog 1 Aug 2005 13:28:30 -0000 1.184
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.183 2005/08/01 13:20:28 ph10 Exp $
+$Cambridge: exim/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
-------------------------------------------
@@ -10,6 +10,8 @@
NewStuff for rationale and an example.
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
Index: exigrep.src
===================================================================
RCS file: /home/cvs/exim/exim-src/src/exigrep.src,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- exigrep.src 21 Dec 2004 11:28:38 -0000 1.2
+++ exigrep.src 1 Aug 2005 13:28:30 -0000 1.3
@@ -1,5 +1,5 @@
#! PERL_COMMAND -w
-# $Cambridge: exim/exim-src/src/exigrep.src,v 1.2 2004/12/21 11:28:38 ph10 Exp $
+# $Cambridge: exim/exim-src/src/exigrep.src,v 1.3 2005/08/01 13:28:30 ph10 Exp $
use strict;
@@ -58,6 +58,11 @@
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} )?)(.*)/;
Index: 904
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/904,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 904 27 Jan 2005 15:00:39 -0000 1.3
+++ 904 1 Aug 2005 13:28:30 -0000 1.4
@@ -1,6 +1,6 @@
1999-03-02 09:44:33 this is a warning at /source/exim4/AutoTest/aux/904.pl line 25.
Exim version x.yz uid=1169 gid=1169 pid=pppp D=100
-Lookups: lsearch wildlsearch nwildlsearch iplsearch cdb dbm dbmnz dnsdb dsearch ldap ldapdn ldapm mysql passwd pgsql testdb
+Lookups: lsearch wildlsearch nwildlsearch iplsearch cdb dbm dbmnz dnsdb dsearch ldap ldapdn ldapm mysql passwd pgsql sqlite testdb
Fixed never_users: 0
configuration file is /source/exim4/AutoTest/confs/904
log selectors = xxxxxxxx xxxxxxxx
