Browse Source

[Minor] Ignore skipped tasks

TODO: write a generic framework for that stuff
tags/1.8.2
Vsevolod Stakhov 5 years ago
parent
commit
a3f746d902

+ 1
- 0
src/plugins/lua/clickhouse.lua View File

@@ -285,6 +285,7 @@ local function clickhouse_send_data(task)
end

local function clickhouse_collect(task)
if task:has_flag('skip') then return end
if not settings.allow_local and rspamd_lua_utils.is_rspamc_or_controller(task) then return end

for _,sym in ipairs(settings.stop_symbols) do

+ 3
- 0
src/plugins/lua/clustering.lua View File

@@ -186,6 +186,9 @@ local function clusterting_filter_cb(task, rule)
end

local function clusterting_idempotent_cb(task, rule)
if task:has_flag('skip') then return end
if not rule.allow_local and lua_util.is_rspamc_or_controller(task) then return end

local verdict = lua_util.get_task_verdict(task)
local score


+ 2
- 0
src/plugins/lua/elastic.lua View File

@@ -208,7 +208,9 @@ end

local function elastic_collect(task)
if not enabled then return end
if task:has_flag('skip') then return end
if not settings.allow_local and lua_util.is_rspamc_or_controller(task) then return end

local row = {['rspamd_meta'] = get_general_metadata(task),
['@timestamp'] = tostring(util.get_time() * 1000)}
table.insert(rows, row)

+ 1
- 0
src/plugins/lua/metadata_exporter.lua View File

@@ -688,6 +688,7 @@ end

local function gen_exporter(rule)
return function (task)
if task:has_flag('skip') then return end
local selector = rule.selector or 'default'
local selected = selectors[selector](task)
if selected then

+ 2
- 0
src/plugins/lua/neural.lua View File

@@ -904,6 +904,8 @@ local function check_anns(rule, _, ev_base)
end

local function ann_push_vector(task)
if task:has_flag('skip') then return end
if not settings.allow_local and lua_util.is_rspamc_or_controller(task) then return end
local scores = task:get_metric_score()
for _,rule in pairs(settings.rules) do
local sid = "0"

+ 2
- 0
src/plugins/lua/ratelimit.lua View File

@@ -622,6 +622,8 @@ local function ratelimit_cb(task)
end

local function ratelimit_update_cb(task)
if task:has_flag('skip') then return end
if not settings.allow_local and lua_util.is_rspamc_or_controller(task) then return end
local prefixes = task:cache_get('ratelimit_prefixes')

if prefixes then

Loading…
Cancel
Save