Report two-phase queue run in daemon startup log line

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 21c84e09110f3b1bfc56b231f3539e2408f353ff..c745d422890b38553c7b59a6fa7f7974a8e87bbc 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -76,6 +76,9 @@ JH/15 Bug 3061: Ensure a log line is written for a malformed address in a
       header, when parsing for address-qualification.  Previously one was only
       written if there were rewrite rules.
 
+JH/16 Two-phase queue runs are now reported in the daemon startup log line and
+      in exiwhat output.
+
 
 Exim version 4.97
 -----------------

diff --git a/src/src/daemon.c b/src/src/daemon.c
index aff05120ae870787fe3248fbf72c4d04dff10abe..704ede24e42c16bc8d584eb757602ad1e99cb908 100644 (file)
--- a/src/src/daemon.c
+++ b/src/src/daemon.c
@@ -1654,7 +1654,7 @@ return 0;
 
 
 
-const uschar *
+static const uschar *
 describe_queue_runners(void)
 {
 gstring * g = NULL;
@@ -1664,6 +1664,7 @@ if (!is_multiple_qrun()) return US"no queue runs";
 for (qrunner * q = qrunners; q; q = q->next)
   {
   g = string_catn(g, US"-q", 2);
+  if (q->queue_2stage) g = string_catn(g, US"q", 1);
   if (q->name) g = string_append(g, 3, US"G", q->name, US"/");
   g = string_cat(g, readconf_printtime(q->interval));
   g = string_catn(g, US" ", 1);