ph10 2004/12/21 11:28:38 GMT
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src exigrep.src
Log:
Fix exigrep for "Completed" lines that have additional data (as a result
of +queue_time_overall).
Revision Changes Path
1.51 +5 -0 exim/exim-doc/doc-txt/ChangeLog
1.2 +1 -1 exim/exim-src/src/exigrep.src
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- ChangeLog 21 Dec 2004 11:12:13 -0000 1.50
+++ ChangeLog 21 Dec 2004 11:28:38 -0000 1.51
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.50 2004/12/21 11:12:13 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.51 2004/12/21 11:28:38 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -217,6 +217,11 @@
happened as part of the Exiscan merge. However, to be on the safe side, I
have made the code more robust (and fixed the comments that describe what
is going on).
+
+53. Now that there can be additional text after "Completed" in log lines (if
+ the queue_time_overall log selector is set), a one-byte patch to exigrep
+ was needed to allow it to recognize "Completed" as not the last thing in
+ the line.
Exim version 4.43
Index: exigrep.src
===================================================================
RCS file: /home/cvs/exim/exim-src/src/exigrep.src,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- exigrep.src 7 Oct 2004 10:39:01 -0000 1.1
+++ exigrep.src 21 Dec 2004 11:28:38 -0000 1.2
@@ -1,5 +1,5 @@
#! PERL_COMMAND -w
-# $Cambridge: exim/exim-src/src/exigrep.src,v 1.1 2004/10/07 10:39:01 ph10 Exp $
+# $Cambridge: exim/exim-src/src/exigrep.src,v 1.2 2004/12/21 11:28:38 ph10 Exp $
use strict;
@@ -81,7 +81,7 @@
# 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})/)
{
