From 561d5f4c2424f2ff4b1066d1efb308ddcc8aa06b Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Fri, 16 Jul 2010 16:13:43 +0400 Subject: [PATCH] * Add more debug to comparing parts distance function * Write action even if message has no symbols --- src/expressions.c | 6 ++++-- src/protocol.c | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/expressions.c b/src/expressions.c index 650721b9e..14ac3d98f 100644 --- a/src/expressions.c +++ b/src/expressions.c @@ -924,7 +924,7 @@ rspamd_header_exists (struct worker_task * task, GList * args, void *unused) gboolean rspamd_parts_distance (struct worker_task * task, GList * args, void *unused) { - int threshold; + int threshold, diff; struct mime_text_part *p1, *p2; GList *cur; struct expression_argument *arg; @@ -952,7 +952,9 @@ rspamd_parts_distance (struct worker_task * task, GList * args, void *unused) return FALSE; } p2 = cur->data; - if (fuzzy_compare_hashes (p1->fuzzy, p2->fuzzy) <= threshold) { + diff = fuzzy_compare_hashes (p1->fuzzy, p2->fuzzy); + debug_task ("got likeliness between parts of %d%%, threshold is %d%%", diff, threshold); + if (diff <= threshold) { return TRUE; } } diff --git a/src/protocol.c b/src/protocol.c index f4e95b40f..7d26d6c80 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -681,9 +681,10 @@ show_metric_result (gpointer metric_name, gpointer metric_value, void *user_data else { r = rspamd_snprintf (outbuf, sizeof (outbuf), "Metric: default; False; 0 / %.2f" CRLF, ms); } + r += rspamd_snprintf (outbuf + r, sizeof (outbuf) - r, "Action: %s" CRLF, str_action_metric (METRIC_ACTION_NOACTION)); } if (!task->is_skipped) { - cd->log_offset += rspamd_snprintf (cd->log_buf + cd->log_offset, cd->log_size - cd->log_offset, "(%s: F: [0/%.2f/%.2f] [", "default", ms, rs); + cd->log_offset += rspamd_snprintf (cd->log_buf + cd->log_offset, cd->log_size - cd->log_offset, "(%s: F (no action): [0/%.2f/%.2f] [", "default", ms, rs); } else { cd->log_offset += rspamd_snprintf (cd->log_buf + cd->log_offset, cd->log_size - cd->log_offset, "(%s: S: [0/%.2f/%.2f] [", "default", ms, rs); -- 2.39.5