[Minor] Allow to log settings id in log format

diff --git a/src/libserver/cfg_file.h b/src/libserver/cfg_file.h
index 39d9977543520e2aa454fac3804e68acc7d9399e..54427c19065b4dae1dbeb2090e27aa7d9ff13646 100644 (file)
--- a/src/libserver/cfg_file.h
+++ b/src/libserver/cfg_file.h
@@ -255,6 +255,7 @@ enum rspamd_log_format_type {
        RSPAMD_LOG_DIGEST,
        RSPAMD_LOG_FILENAME,
        RSPAMD_LOG_FORCED_ACTION,
+       RSPAMD_LOG_SETTINGS_ID,
 };
 
 enum rspamd_log_format_flags {

diff --git a/src/libserver/task.c b/src/libserver/task.c
index fd14a68f2ce0ee0641a18d09dfff7f2ea35b10eb..e14ce5c5f1bfcee5fa47bf21a6c1c272e9786af0 100644 (file)
--- a/src/libserver/task.c
+++ b/src/libserver/task.c
@@ -1001,6 +1001,11 @@ rspamd_task_log_check_condition (struct rspamd_task *task,
                        ret = TRUE;
                }
                break;
+       case RSPAMD_LOG_SETTINGS_ID:
+               if (task->settings_elt) {
+                       ret = TRUE;
+               }
+               break;
        default:
                ret = TRUE;
                break;
@@ -1462,6 +1467,16 @@ rspamd_task_log_variable (struct rspamd_task *task,
                        var.len = sizeof (undef) - 1;
                }
                break;
+       case RSPAMD_LOG_SETTINGS_ID:
+               if (task->settings_elt) {
+                       var.begin = task->settings_elt->name;
+                       var.len = strlen (task->settings_elt->name);
+               }
+               else {
+                       var.begin = undef;
+                       var.len = sizeof (undef) - 1;
+               }
+               break;
        default:
                var = rspamd_task_log_metric_res (task, lf);
                break;