From 3eef829edc39e51faf5c9dd09958d9d0b4aa1f38 Mon Sep 17 00:00:00 2001
From: Philip Hazel <ph10@hermes.cam.ac.uk>
Date: Tue, 14 Feb 2006 15:24:10 +0000
Subject: [PATCH] Tidy queue run abandon log message.

---
 doc/doc-txt/ChangeLog | 8 +++++++-
 src/ACKNOWLEDGMENTS   | 3 ++-
 src/src/queue.c       | 5 +++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index f23bd7e04..37f47db80 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.300 2006/02/14 15:11:43 ph10 Exp $
+$Cambridge: 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
 -------------------------------------------
@@ -166,6 +166,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
 -----------------
diff --git a/src/ACKNOWLEDGMENTS b/src/ACKNOWLEDGMENTS
index 455b39fe5..b0285c65e 100644
--- a/src/ACKNOWLEDGMENTS
+++ b/src/ACKNOWLEDGMENTS
@@ -1,4 +1,4 @@
-$Cambridge: exim/src/ACKNOWLEDGMENTS,v 1.40 2006/02/13 12:02:59 ph10 Exp $
+$Cambridge: exim/src/ACKNOWLEDGMENTS,v 1.41 2006/02/14 15:24:10 ph10 Exp $
 
 EXIM ACKNOWLEDGEMENTS
 
@@ -235,6 +235,7 @@ Samuli Tuomola            OS files for QNX 6.2.0
 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
diff --git a/src/src/queue.c b/src/src/queue.c
index 15b44f2a2..caceeb097 100644
--- a/src/src/queue.c
+++ b/src/src/queue.c
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/src/src/queue.c,v 1.9 2006/02/07 11:19:00 ph10 Exp $ */
+/* $Cambridge: 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 @@ for (i  = (queue_run_in_order? -1 : 0);
       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 */
-- 
2.25.1