in the /history response since we have the `passthrough_module` key for that purpose. While that might be handy in some situations, mixing actions and module names is confusing in general.tags/3.8.2
@@ -186,23 +186,4 @@ exports.describe = function(verdict, what) | |||
return nil | |||
end | |||
---[[[ | |||
--]] | |||
exports.adjust_passthrough_action = function(task) | |||
local action = task:get_metric_action() | |||
if action == 'soft reject' then | |||
local has_pr, _, _, module = task:has_pre_result() | |||
if has_pr and module then | |||
action = module | |||
end | |||
end | |||
return action | |||
end | |||
return exports | |||
return exports |
@@ -47,7 +47,6 @@ local lua_redis = require "lua_redis" | |||
local fun = require "fun" | |||
local ucl = require "ucl" | |||
local ts = (require "tableshape").types | |||
local lua_verdict = require "lua_verdict" | |||
local E = {} | |||
local N = "history_redis" | |||
local hostname = rspamd_util.get_hostname() | |||
@@ -115,7 +114,7 @@ local function normalise_results(tbl, task) | |||
tbl.rmilter = nil | |||
tbl.messages = nil | |||
tbl.urls = nil | |||
tbl.action = lua_verdict.adjust_passthrough_action(task) | |||
tbl.action = task:get_metric_action() | |||
local seconds = task:get_timeval()['tv_sec'] | |||
tbl.unix_time = seconds |