From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Sat, 25 Mar 2017 22:16:32 +0000 (+0000)
Subject: [Fix] Fix one-shot symbols weight calculations
X-Git-Tag: 1.5.4~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=543152034c1fea79c4f8b3458c3b4a5c3f8a35cc;p=thirdparty%2Frspamd.git

[Fix] Fix one-shot symbols weight calculations
---

diff --git a/src/libmime/filter.c b/src/libmime/filter.c
index c95dfc5858..8b8ddf309b 100644
--- a/src/libmime/filter.c
+++ b/src/libmime/filter.c
@@ -174,8 +174,8 @@ insert_metric_result (struct rspamd_task *task,
 		}
 		else {
 			if (fabs (s->score) < fabs (w) && signbit (s->score) == signbit (w)) {
-				/* Replace less weight with a bigger one */
-				diff = metric_res->score - s->score + w;
+				/* Replace less significant weight with a more significant one */
+				diff = w - s->score;
 			}
 			else {
 				diff = 0;
diff --git a/src/lua/lua_task.c b/src/lua/lua_task.c
index d8df34e1e0..36272ecfe2 100644
--- a/src/lua/lua_task.c
+++ b/src/lua/lua_task.c
@@ -3805,6 +3805,8 @@ lua_task_set_metric_score (lua_State *L)
 	if (task && metric_name) {
 		if ((metric_res =
 			g_hash_table_lookup (task->results, metric_name)) != NULL) {
+			msg_debug_task ("set metric score from %.2f to %.2f",
+				metric_res->score, nscore);
 			metric_res->score = nscore;
 			lua_pushboolean (L, true);
 		}