diff options
Diffstat (limited to 'lualib/lua_scanners/clamav.lua')
| -rw-r--r-- | lualib/lua_scanners/clamav.lua | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/lualib/lua_scanners/clamav.lua b/lualib/lua_scanners/clamav.lua index 01386cfe7..7771261e1 100644 --- a/lualib/lua_scanners/clamav.lua +++ b/lualib/lua_scanners/clamav.lua @@ -151,19 +151,11 @@ local function clamav_check(task, content, digest, rule) end end if cached then - common.save_av_cache(task, digest, rule, cached) + common.save_cache(task, digest, rule, cached) end end end - if rule.dynamic_scan then - local pre_check, pre_check_msg = common.check_metric_results(task, rule) - if pre_check then - rspamd_logger.infox(task, '%s: aborting: %s', rule.log_prefix, pre_check_msg) - return true - end - end - tcp.request({ task = task, host = addr:to_string(), @@ -175,13 +167,10 @@ local function clamav_check(task, content, digest, rule) }) end - if common.need_av_check(task, content, rule) then - if common.check_av_cache(task, digest, rule, clamav_check_uncached) then - return - else - clamav_check_uncached() - end + if common.need_check(task, content, rule, digest) then + clamav_check_uncached() end + end return { |