summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPhilip Hazel <ph10@hermes.cam.ac.uk>2006-02-14 15:24:10 +0000
committerPhilip Hazel <ph10@hermes.cam.ac.uk>2006-02-14 15:24:10 +0000
commit3eef829edc39e51faf5c9dd09958d9d0b4aa1f38 (patch)
tree85315c314261003d0c79443c322bdd52936b6de1 /src
parent2cbb4081528ed0f71b474f88cf36a55fb0717863 (diff)
Tidy queue run abandon log message.
Diffstat (limited to 'src')
-rw-r--r--src/ACKNOWLEDGMENTS3
-rw-r--r--src/src/queue.c5
2 files changed, 5 insertions, 3 deletions
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 */