From e8012beb78e51bb72a534babca6d6b43136c0cb9 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Wed, 20 Jul 2016 12:40:28 +0100 Subject: [PATCH] Named queues: Add queue name to "queued by ACL" log line --- src/src/receive.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/src/receive.c b/src/src/receive.c index a59fbc991..6c214152a 100644 --- a/src/src/receive.c +++ b/src/src/receive.c @@ -3894,7 +3894,9 @@ if (message_logs && blackholed_by == NULL) if (deliver_freeze) fprintf(message_log, "%s frozen by %s\n", now, frozen_by); if (queue_only_policy) fprintf(message_log, - "%s no immediate delivery: queued by %s\n", now, queued_by); + "%s no immediate delivery: queued%s%s by %s\n", now, + *queue_name ? " in " : "", *queue_name ? CS queue_name : "", + queued_by); (void)fclose(message_log); } } @@ -4014,7 +4016,9 @@ if(!smtp_reply) if (deliver_freeze) log_write(0, LOG_MAIN, "frozen by %s", frozen_by); if (queue_only_policy) log_write(L_delay_delivery, LOG_MAIN, - "no immediate delivery: queued by %s", queued_by); + "no immediate delivery: queued%s%s by %s", + *queue_name ? " in " : "", *queue_name ? CS queue_name : "", + queued_by); } receive_call_bombout = FALSE; -- 2.30.2