From: Vsevolod Stakhov <vsevolod@rspamd.com>
Date: Mon, 5 Aug 2024 16:20:32 +0000 (+0100)
Subject: [Minor] Pass queue-id from Milter to log tag
X-Git-Tag: 3.10.0~65^2~1^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a770359830ce35e877c729da9655c772b5e4b2c3;p=thirdparty%2Frspamd.git

[Minor] Pass queue-id from Milter to log tag
---

diff --git a/src/libserver/milter.c b/src/libserver/milter.c
index f35278a0e4..94b0d6cc14 100644
--- a/src/libserver/milter.c
+++ b/src/libserver/milter.c
@@ -1465,10 +1465,16 @@ rspamd_milter_macro_http(struct rspamd_milter_session *session,
 		return;
 	}
 
+	/*
+	 * When we get a queue-id we try to pass it to the backend, where possible
+	 * We also need that for logging consistency
+	 */
 	IF_MACRO("{i}")
 	{
 		rspamd_http_message_add_header_len(msg, QUEUE_ID_HEADER,
 										   found->begin, found->len);
+		rspamd_http_message_add_header_len(msg, LOG_TAG_HEADER,
+										   found->begin, found->len);
 	}
 	else
 	{
@@ -1476,6 +1482,8 @@ rspamd_milter_macro_http(struct rspamd_milter_session *session,
 		{
 			rspamd_http_message_add_header_len(msg, QUEUE_ID_HEADER,
 											   found->begin, found->len);
+			rspamd_http_message_add_header_len(msg, LOG_TAG_HEADER,
+											   found->begin, found->len);
 		}
 	}