Gitweb:
https://git.exim.org/exim.git/commitdiff/4f1d6cb9b60f4d26c0654eba8889c04079d046d2
Commit: 4f1d6cb9b60f4d26c0654eba8889c04079d046d2
Parent: 43a1dac4b63c228775d92cdc2861b6f1e76c6f1f
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Thu Jan 4 22:29:59 2024 +0000
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Thu Jan 4 22:35:05 2024 +0000
Report two-phase queue run in daemon startup log line
---
doc/doc-txt/ChangeLog | 3 +++
src/src/daemon.c | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 21c84e091..c745d4228 100644
--- 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 aff05120a..704ede24e 100644
--- 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);
--
## subscription configuration (requires account):
##
https://lists.exim.org/mailman3/postorius/lists/exim-cvs.lists.exim.org/
## unsubscribe (doesn't require an account):
## exim-cvs-unsubscribe@???
## Exim details at
http://www.exim.org/
## Please use the Wiki with this list -
http://wiki.exim.org/
