[Rework] Always create result for a task

3 files changed, 2 insertions, 8 deletions

diff --git a/src/libserver/symbols_cache.c b/src/libserver/symbols_cache.c
index 0bd90ec70..9cd52458b 100644
--- a/src/libserver/symbols_cache.c
+++ b/src/libserver/symbols_cache.c
@@ -1607,7 +1607,7 @@ rspamd_symbols_cache_make_checkpoint (struct rspamd_task *task,
 	checkpoint->pass = RSPAMD_CACHE_PASS_INIT;
 	task->checkpoint = checkpoint;
 
-	task->result = rspamd_create_metric_result (task);
+	task->result = task->result;
 
 	return checkpoint;
 }
diff --git a/src/libserver/task.c b/src/libserver/task.c
index 0fde93f55..42d9b1789 100644
--- a/src/libserver/task.c
+++ b/src/libserver/task.c
@@ -145,7 +145,7 @@ rspamd_task_new (struct rspamd_worker *worker, struct rspamd_config *cfg,
 
 	new_task->sock = -1;
 	new_task->flags |= (RSPAMD_TASK_FLAG_MIME|RSPAMD_TASK_FLAG_JSON);
-	new_task->pre_result.action = METRIC_ACTION_MAX;
+	new_task->result = rspamd_create_metric_result (new_task);
 
 	new_task->message_id = new_task->queue_id = "undef";
 	new_task->messages = ucl_object_typed_new (UCL_OBJECT);
diff --git a/src/libserver/task.h b/src/libserver/task.h
index b9fd2f811..c1eec96ed 100644
--- a/src/libserver/task.h
+++ b/src/libserver/task.h
@@ -201,12 +201,6 @@ struct rspamd_task {
 	struct event *guard_ev;							/**< Event for input sanity guard 					*/
 
 	gpointer checkpoint;							/**< Opaque checkpoint data							*/
-
-	struct {
-		gint action;								/**< Action of pre filters							*/
-		gchar *str;									/**< String describing action						*/
-	} pre_result;									/**< Result of pre-filters							*/
-
 	ucl_object_t *settings;							/**< Settings applied to task						*/
 
 	const gchar *classifier;						/**< Classifier to learn (if needed)				*/