[Minor] Add timeout augmentation for external services/av plugins

diff --git a/src/plugins/lua/antivirus.lua b/src/plugins/lua/antivirus.lua
index c73e4fa2f21fbaaa38ce18f05816b93c023ceec4..dba472c5003abf762318e04f961e3a6ebe78e05b 100644 (file)
--- a/src/plugins/lua/antivirus.lua
+++ b/src/plugins/lua/antivirus.lua
@@ -197,6 +197,14 @@ if opts and type(opts) == 'table' then
           t.type = 'normal'
         end
 
+        t.augmentations = {}
+
+        if type(m.timeout) == 'number' then
+          -- Here, we ignore possible DNS timeout and timeout from multiple retries
+          -- as these situations are not usual nor likely for the antivirus module
+          table.insert(t.augmentations, string.format("timeout=%f", m.timeout))
+        end
+
         local id = rspamd_config:register_symbol(t)
 
         rspamd_config:register_symbol({

diff --git a/src/plugins/lua/external_services.lua b/src/plugins/lua/external_services.lua
index bafcc9eecbcfbbc4dd827509ff2c696906eeabef..96e6b9e9444e6b5f5e8215e87c0bbdf43465cf38 100644 (file)
--- a/src/plugins/lua/external_services.lua
+++ b/src/plugins/lua/external_services.lua
@@ -227,6 +227,14 @@ if opts and type(opts) == 'table' then
           t.type = 'normal'
         end
 
+        t.augmentations = {}
+
+        if type(m.timeout) == 'number' then
+          -- Here, we ignore possible DNS timeout and timeout from multiple retries
+          -- as these situations are not usual nor likely for the external_services module
+          table.insert(t.augmentations, string.format("timeout=%f", m.timeout))
+        end
+
         local id = rspamd_config:register_symbol(t)
 
         if m.symbol_fail then