ph10 2004/11/24 14:38:14 GMT
Modified files:
exim-doc/doc-txt ChangeLog NewStuff
exim-src ACKNOWLEDGMENTS
exim-src/src deliver.c globals.c macros.h
exim-test-orig/AutoTest/confs 591
exim-test-orig/AutoTest/log 591
Log:
Added log_selector=+queue_time_overall.
Revision Changes Path
1.37 +2 -0 exim/exim-doc/doc-txt/ChangeLog
1.15 +6 -0 exim/exim-doc/doc-txt/NewStuff
1.6 +2 -1 exim/exim-src/ACKNOWLEDGMENTS
1.3 +9 -2 exim/exim-src/src/deliver.c
1.7 +1 -0 exim/exim-src/src/globals.c
1.3 +11 -10 exim/exim-src/src/macros.h
1.2 +1 -1 exim/exim-test-orig/AutoTest/confs/591
1.2 +1 -1 exim/exim-test-orig/AutoTest/log/591
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ChangeLog 22 Nov 2004 11:30:03 -0000 1.36
+++ ChangeLog 24 Nov 2004 14:38:13 -0000 1.37
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.36 2004/11/22 11:30:03 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.37 2004/11/24 14:38:13 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -163,6 +163,8 @@
38. The dnslists ACL condition has been extended: it is now possible to supply
a list of IP addresses and/or domains to be looked up in a particular DNS
domain.
+
+39. Added log_selector=+queue_time_overall.
Exim version 4.43
Index: NewStuff
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/NewStuff,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- NewStuff 22 Nov 2004 11:30:03 -0000 1.14
+++ NewStuff 24 Nov 2004 14:38:13 -0000 1.15
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.14 2004/11/22 11:30:03 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/NewStuff,v 1.15 2004/11/24 14:38:13 ph10 Exp $
New Features in Exim
--------------------
@@ -195,6 +195,12 @@
Once a DNS record has been found (that matches a specific IP return
address, if specified), no further lookups are done.
+
+16. The log selector queue_time_overall causes Exim to output the time spent on
+ the queue as an addition to the "Completed" message. Like queue_time (which
+ puts the queue time on individual delivery lines), the time is tagged with
+ "QT=", and it is measured from the time that the message starts to be
+ received, so it includes the reception time.
Version 4.43
Index: ACKNOWLEDGMENTS
===================================================================
RCS file: /home/cvs/exim/exim-src/ACKNOWLEDGMENTS,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ACKNOWLEDGMENTS 12 Nov 2004 15:03:40 -0000 1.5
+++ ACKNOWLEDGMENTS 24 Nov 2004 14:38:13 -0000 1.6
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-src/ACKNOWLEDGMENTS,v 1.5 2004/11/12 15:03:40 ph10 Exp $
+$Cambridge: exim/exim-src/ACKNOWLEDGMENTS,v 1.6 2004/11/24 14:38:13 ph10 Exp $
EXIM ACKNOWLEDGEMENTS
@@ -20,7 +20,7 @@
Philip Hazel
Lists created: 20 November 2002
-Last updated: 10 November 2004
+Last updated: 24 November 2004
THE OLD LIST
@@ -85,6 +85,7 @@
Several minor fixes and suggestions
Oliver Cook Suggested patch for exigrep & rejected messages
Patch to add sender/host info to local_scan() rejects
+ Suggested patch to add queue time to "Completed"
Jennifer Corley Designing the new Exim logo
John Dalbec Patch for quota_warn_threshold bug
Vivek Dasmohapatra Suggested patch for CRL support
Index: deliver.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/deliver.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- deliver.c 18 Nov 2004 10:35:19 -0000 1.2
+++ deliver.c 24 Nov 2004 14:38:13 -0000 1.3
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/deliver.c,v 1.2 2004/11/18 10:35:19 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/deliver.c,v 1.3 2004/11/24 14:38:13 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -6315,14 +6315,21 @@
}
/* Remove the two message files. */
-
+
sprintf(CS spoolname, "%s/input/%s/%s-D", spool_directory, message_subdir, id);
if (Uunlink(spoolname) < 0)
log_write(0, LOG_MAIN|LOG_PANIC_DIE, "failed to unlink %s", spoolname);
sprintf(CS spoolname, "%s/input/%s/%s-H", spool_directory, message_subdir, id);
if (Uunlink(spoolname) < 0)
log_write(0, LOG_MAIN|LOG_PANIC_DIE, "failed to unlink %s", spoolname);
- log_write(0, LOG_MAIN, "Completed");
+
+ /* Log the end of this message, with queue time if requested. */
+
+ if ((log_extra_selector & LX_queue_time_overall) != 0)
+ log_write(0, LOG_MAIN, "Completed QT=%s",
+ readconf_printtime(time(NULL) - received_time));
+ else
+ log_write(0, LOG_MAIN, "Completed");
}
/* If there are deferred addresses, we are keeping this message because it is
Index: globals.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/globals.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- globals.c 10 Nov 2004 10:29:56 -0000 1.6
+++ globals.c 24 Nov 2004 14:38:13 -0000 1.7
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/globals.c,v 1.6 2004/11/10 10:29:56 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/globals.c,v 1.7 2004/11/24 14:38:13 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -601,6 +601,7 @@
{ US"outgoing_port", LX_outgoing_port },
{ US"queue_run", L_queue_run },
{ US"queue_time", LX_queue_time },
+ { US"queue_time_overall", LX_queue_time_overall },
{ US"received_recipients", LX_received_recipients },
{ US"received_sender", LX_received_sender },
{ US"rejected_header", LX_rejected_header },
Index: macros.h
===================================================================
RCS file: /home/cvs/exim/exim-src/src/macros.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- macros.h 4 Nov 2004 10:42:11 -0000 1.2
+++ macros.h 24 Nov 2004 14:38:13 -0000 1.3
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/macros.h,v 1.2 2004/11/04 10:42:11 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/macros.h,v 1.3 2004/11/24 14:38:13 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -361,16 +361,17 @@
#define LX_incoming_port 0x80000020
#define LX_outgoing_port 0x80000040
#define LX_queue_time 0x80000080
-#define LX_received_sender 0x80000100
-#define LX_received_recipients 0x80000200
-#define LX_rejected_header 0x80000400
-#define LX_return_path_on_delivery 0x80000800
-#define LX_sender_on_delivery 0x80001000
-#define LX_smtp_confirmation 0x80002000
-#define LX_subject 0x80004000
-#define LX_tls_certificate_verified 0x80008000
-#define LX_tls_cipher 0x80010000
-#define LX_tls_peerdn 0x80020000
+#define LX_queue_time_overall 0x80000100
+#define LX_received_sender 0x80000200
+#define LX_received_recipients 0x80000400
+#define LX_rejected_header 0x80000800
+#define LX_return_path_on_delivery 0x80001000
+#define LX_sender_on_delivery 0x80002000
+#define LX_smtp_confirmation 0x80004000
+#define LX_subject 0x80008000
+#define LX_tls_certificate_verified 0x80010000
+#define LX_tls_cipher 0x80020000
+#define LX_tls_peerdn 0x80040000
#define L_default (L_connection_reject | \
L_delay_delivery | \
Index: 591
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/confs/591,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 591 4 Nov 2004 10:46:59 -0000 1.1
+++ 591 24 Nov 2004 14:38:13 -0000 1.2
@@ -13,7 +13,7 @@
# ----- Main settings -----
-
+log_selector = +queue_time_overall
# ----- Routers -----
Index: 591
===================================================================
RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/591,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 591 4 Nov 2004 10:46:59 -0000 1.1
+++ 591 24 Nov 2004 14:38:14 -0000 1.2
@@ -1,7 +1,7 @@
1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=242
1999-03-02 09:44:33 10HmaX-0005vi-00 => discarded <exim@???> R=r1
1999-03-02 09:44:33 10HmaX-0005vi-00 => discarded <sieve@???> R=r1
-1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaX-0005vi-00 Completed QT=0s
1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? U=ph10 P=local S=242
1999-03-02 09:44:33 10HmaY-0005vi-00 => discarded <exim@???> R=r1
1999-03-02 09:44:33 10HmaY-0005vi-00 == sieve@??? R=r1 defer (-17): error in filter file: Sieve filtering not enabled
