From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 6 Nov 2015 14:51:16 +0000 (+0000)
Subject: Store real required score inside metric result
X-Git-Tag: 1.1.0~626
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6921abd84341a5b2719885165cdf42d6c8ad67c6;p=thirdparty%2Frspamd.git

Store real required score inside metric result
---

diff --git a/src/libmime/filter.h b/src/libmime/filter.h
index aec06d670b..51a1d43047 100644
--- a/src/libmime/filter.h
+++ b/src/libmime/filter.h
@@ -50,11 +50,12 @@ struct metric {
 struct metric_result {
 	struct metric *metric;                          /**< pointer to metric structure			*/
 	double score;                                   /**< total score							*/
-	enum rspamd_metric_action action;				/**< the current action						*/
+	double required_score;                          /**< real required score					*/
+	double grow_factor;								/**< current grow factor					*/
 	GHashTable *symbols;                            /**< symbols of metric						*/
 	GHashTable *sym_groups;							/**< groups of symbols						*/
 	gboolean checked;                               /**< whether metric result is consolidated  */
-	double grow_factor;                             /**< current grow factor					*/
+	enum rspamd_metric_action action;                /**< the current action						*/
 };
 
 /**
diff --git a/src/libserver/protocol.c b/src/libserver/protocol.c
index 35697427fc..10bbbe2a5e 100644
--- a/src/libserver/protocol.c
+++ b/src/libserver/protocol.c
@@ -817,12 +817,11 @@ rspamd_metric_result_ucl (struct rspamd_task *task,
 	enum rspamd_metric_action action = METRIC_ACTION_NOACTION;
 	ucl_object_t *obj = NULL, *sobj;;
 	gpointer h, v;
-	double required_score;
 	const gchar *subject;
 
 	m = mres->metric;
 	mres->action = rspamd_check_action_metric (task, mres->score,
-					&required_score, m);
+					&mres->required_score, m);
 
 	action = mres->action;
 	is_spam = (action == METRIC_ACTION_REJECT);
@@ -834,7 +833,7 @@ rspamd_metric_result_ucl (struct rspamd_task *task,
 		"is_skipped", 0, false);
 	ucl_object_insert_key (obj, ucl_object_fromdouble (mres->score),
 		"score", 0, false);
-	ucl_object_insert_key (obj, ucl_object_fromdouble (required_score),
+	ucl_object_insert_key (obj, ucl_object_fromdouble (mres->required_score),
 		"required_score", 0, false);
 	ucl_object_insert_key (obj,
 		ucl_object_fromstring (rspamd_action_to_str (action)),