Browse Source

[Minor] Fix some more issues after actions rework

tags/1.9.0
Vsevolod Stakhov 5 years ago
parent
commit
e6e1267ea7
2 changed files with 7 additions and 3 deletions
  1. 2
    2
      src/libmime/filter.c
  2. 5
    1
      src/libserver/task.c

+ 2
- 2
src/libmime/filter.c View File

@@ -494,7 +494,6 @@ rspamd_check_action_metric (struct rspamd_task *task)
struct rspamd_passthrough_result *pr;
double max_score = -(G_MAXDOUBLE), sc;
int i;
gboolean set_action = FALSE;
struct rspamd_metric_result *mres = task->result;

/* We are not certain about the results during processing */
@@ -507,7 +506,8 @@ rspamd_check_action_metric (struct rspamd_task *task)
noaction = action_lim;
}

if (isnan (sc)) {
if (isnan (sc) ||
(action_lim->action->flags & (RSPAMD_ACTION_NO_THRESHOLD|RSPAMD_ACTION_HAM))) {
continue;
}


+ 5
- 1
src/libserver/task.c View File

@@ -1553,7 +1553,11 @@ rspamd_task_get_required_score (struct rspamd_task *task, struct rspamd_metric_r
}

for (i = m->nactions - 1; i >= 0; i --) {
if (!isnan (m->actions_limits[i].cur_limit)) {
struct rspamd_action_result *action_lim = &m->actions_limits[i];


if (!isnan (action_lim->cur_limit) &&
!(action_lim->action->flags & (RSPAMD_ACTION_NO_THRESHOLD|RSPAMD_ACTION_HAM))) {
return m->actions_limits[i].cur_limit;
}
}

Loading…
Cancel
Save