ph10 2006/02/14 15:24:10 GMT
Modified files:
exim-doc/doc-txt ChangeLog
exim-src ACKNOWLEDGMENTS
exim-src/src queue.c
Log:
Tidy queue run abandon log message.
Revision Changes Path
1.301 +6 -0 exim/exim-doc/doc-txt/ChangeLog
1.41 +1 -0 exim/exim-src/ACKNOWLEDGMENTS
1.10 +2 -1 exim/exim-src/src/queue.c
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -r1.300 -r1.301
--- ChangeLog 14 Feb 2006 15:11:43 -0000 1.300
+++ ChangeLog 14 Feb 2006 15:24:10 -0000 1.301
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.300 2006/02/14 15:11:43 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.301 2006/02/14 15:24:10 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -165,6 +165,12 @@
PH/32 In November 2003, the code in Exim that added an empty Bcc: header when
needed by RFC 822 but not by RFC 2822 was commented out. I have now
tidied the source and removed it altogether.
+
+PH/33 When a queue run was abandoned because the load average was too high, a
+ log line was always written; now it is written only if the queue_run log
+ selector is set. In addition, the log line for abandonment now contains
+ information about the queue run such as the pid. This is always present
+ in "start" and "stop" lines but was omitted from the "abandon" line.
Exim version 4.60
Index: ACKNOWLEDGMENTS
===================================================================
RCS file: /home/cvs/exim/exim-src/ACKNOWLEDGMENTS,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- ACKNOWLEDGMENTS 13 Feb 2006 12:02:59 -0000 1.40
+++ ACKNOWLEDGMENTS 14 Feb 2006 15:24:10 -0000 1.41
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-src/ACKNOWLEDGMENTS,v 1.40 2006/02/13 12:02:59 ph10 Exp $
+$Cambridge: exim/exim-src/ACKNOWLEDGMENTS,v 1.41 2006/02/14 15:24:10 ph10 Exp $
EXIM ACKNOWLEDGEMENTS
@@ -235,6 +235,7 @@
Dave Turner Suggested patch for sender rewriting brokenness
Carlos Villegas Suggested patch for "headers" in filter files
Matthias Waffenschmidt Patch for build-time Perl bug in configure script
+ Queue run abandon log message tidy up
Norihisa Washitake Suggested patch for RFC 2047 header decoding
Chris Webb Patch for support of an SPF lookup method.
Florian Weimer Patch for minor format string issue
Index: queue.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/queue.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- queue.c 7 Feb 2006 11:19:00 -0000 1.9
+++ queue.c 14 Feb 2006 15:24:10 -0000 1.10
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/queue.c,v 1.9 2006/02/07 11:19:00 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/queue.c,v 1.10 2006/02/14 15:24:10 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -453,7 +453,8 @@
load_average = os_getloadavg();
if (load_average > deliver_queue_load_max)
{
- log_write(0, LOG_MAIN, "abandon queue run (load %.2f, max %.2f)",
+ log_write(L_queue_run, LOG_MAIN, "Abandon queue run: %s (load %.2f, max %.2f)",
+ log_detail,
(double)load_average/1000.0,
(double)deliver_queue_load_max/1000.0);
i = subcount; /* Don't process other directories */
