commit 3a0280e: [Minor] Improve logging of the unknown settings id

Vsevolod Stakhov vsevolod at highsecure.ru
Fri Jul 5 15:28:06 UTC 2019


Author: Vsevolod Stakhov
Date: 2019-07-05 16:18:55 +0100
URL: https://github.com/rspamd/rspamd/commit/3a0280eca85f656f74c9a13b94e4a39df1085d29

[Minor] Improve logging of the unknown settings id

---
 src/libserver/protocol.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c
index 4f854328f..bef7a0452 100644
--- a/src/libserver/protocol.c
+++ b/src/libserver/protocol.c
@@ -488,8 +488,20 @@ rspamd_protocol_handle_headers (struct rspamd_task *task,
 							task->cfg, hv_tok->begin, hv_tok->len);
 
 					if (task->settings_elt == NULL) {
-						msg_warn_protocol ("unknown settings id: %V",
-								hv);
+						GString *known_ids = g_string_new (NULL);
+						struct rspamd_config_settings_elt *cur;
+
+						DL_FOREACH (task->cfg->setting_ids, cur) {
+							rspamd_printf_gstring (known_ids, "%s(%ud);",
+									cur->name, cur->id);
+						}
+
+						msg_warn_protocol ("unknown settings id: %V(%d); known_ids: %v",
+								hv,
+								rspamd_config_name_to_id (hv_tok->begin, hv_tok->len),
+								known_ids);
+
+						g_string_free (known_ids, TRUE);
 					}
 					else {
 						msg_debug_protocol ("applied settings id %V -> %ud", hv,


More information about the Commits mailing list