diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-11-06 14:51:16 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-11-06 14:51:16 +0000 |
| commit | 6921abd84341a5b2719885165cdf42d6c8ad67c6 (patch) | |
| tree | a26b1be7bb5ad4fca069731288b3a62ca2fcbdef /src | |
| parent | fe927a38449754f0a5fe090c52b5552b75dd04fd (diff) | |
| download | rspamd-6921abd84341a5b2719885165cdf42d6c8ad67c6.tar.gz rspamd-6921abd84341a5b2719885165cdf42d6c8ad67c6.zip | |
Store real required score inside metric result
Diffstat (limited to 'src')
| -rw-r--r-- | src/libmime/filter.h | 5 | ||||
| -rw-r--r-- | src/libserver/protocol.c | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/libmime/filter.h b/src/libmime/filter.h index aec06d670..51a1d4304 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 35697427f..10bbbe2a5 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)), |