From afa6d3adc30bd4898825af38763ce008cab5a774 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sun, 8 May 2016 01:24:47 +0100 Subject: logging --- src/src/deliver.c | 9 +++++++++ src/src/receive.c | 3 +++ 2 files changed, 12 insertions(+) (limited to 'src') diff --git a/src/src/deliver.c b/src/src/deliver.c index 631a3e18a..1fd3d46c0 100644 --- a/src/src/deliver.c +++ b/src/src/deliver.c @@ -880,6 +880,9 @@ if (LOGGING(sender_on_delivery) || msg) sender_address, US">"); +if (*queue_name) + s = string_append(s, &size, &ptr, 2, US" Q=", queue_name); + #ifdef EXPERIMENTAL_SRS if(addr->prop.srs_sender) s = string_append(s, &size, &ptr, 3, US" SRS=<", addr->prop.srs_sender, US">"); @@ -1267,6 +1270,9 @@ else if (result == DEFER || result == PANIC) s = string_cat(s, &size, &ptr, log_address); + if (*queue_name) + s = string_append(s, &size, &ptr, 2, US" Q=", queue_name); + /* Either driver_name contains something and driver_kind contains " router" or " transport" (note the leading space), or driver_name is a null string and driver_kind contains "routing" without the leading @@ -1388,6 +1394,9 @@ else if (LOGGING(sender_on_delivery)) s = string_append(s, &size, &ptr, 3, US" F=<", sender_address, US">"); + if (*queue_name) + s = string_append(s, &size, &ptr, 2, US" Q=", queue_name); + /* Return path may not be set if no delivery actually happened */ if (used_return_path && LOGGING(return_path_on_delivery)) diff --git a/src/src/receive.c b/src/src/receive.c index ea99cfb2b..c783cedfd 100644 --- a/src/src/receive.c +++ b/src/src/receive.c @@ -3804,6 +3804,9 @@ if (LOGGING(8bitmime)) s = string_append(s, &size, &sptr, 2, US" M8S=", big_buffer); } +if (*queue_name) + s = string_append(s, &size, &sptr, 2, US" Q=", queue_name); + /* If an addr-spec in a message-id contains a quoted string, it can contain any characters except " \ and CR and so in particular it can contain NL! Therefore, make sure we use a printing-characters only version for the log. -- cgit v1.2.3