[Minor] Add logging variable for forced actions

1 files changed, 29 insertions, 1 deletions

diff --git a/src/libserver/task.c b/src/libserver/task.c
index 42d9b1789..f4a09fd30 100644
--- a/src/libserver/task.c
+++ b/src/libserver/task.c
@@ -1010,6 +1010,11 @@ rspamd_task_log_check_condition (struct rspamd_task *task,
 			ret = TRUE;
 		}
 		break;
+	case RSPAMD_LOG_FORCED_ACTION:
+		if (task->result->passthrough_result) {
+			ret = TRUE;
+		}
+		break;
 	default:
 		ret = TRUE;
 		break;
@@ -1292,7 +1297,7 @@ rspamd_task_log_variable (struct rspamd_task *task,
 {
 	rspamd_fstring_t *res = logbuf;
 	rspamd_ftok_t var = {.begin = NULL, .len = 0};
-	static gchar numbuf[64];
+	static gchar numbuf[128];
 	static const gchar undef[] = "undef";
 
 	switch (lf->type) {
@@ -1412,6 +1417,29 @@ rspamd_task_log_variable (struct rspamd_task *task,
 			var.len = sizeof (undef) - 1;
 		}
 		break;
+	case RSPAMD_LOG_FORCED_ACTION:
+		if (task->result->passthrough_result) {
+			struct rspamd_passthrough_result *pr = task->result->passthrough_result;
+
+			if (!isnan (pr->target_score)) {
+				var.len = rspamd_snprintf (numbuf, sizeof (numbuf),
+						"%s \"%s\"; score=%.2f (set by %s)",
+						rspamd_action_to_str (pr->action),
+						pr->message, pr->target_score, pr->module);
+			}
+			else {
+				var.len = rspamd_snprintf (numbuf, sizeof (numbuf),
+						"%s \"%s\"; score=nan (set by %s)",
+						rspamd_action_to_str (pr->action),
+						pr->message, pr->module);
+			}
+			var.begin = numbuf;
+		}
+		else {
+			var.begin = undef;
+			var.len = sizeof (undef) - 1;
+		}
+		break;
 	default:
 		var = rspamd_task_log_metric_res (task, lf);
 		break;