[Minor] Use controller for single-instance tasks

diff --git a/src/plugins/lua/bayes_expiry.lua b/src/plugins/lua/bayes_expiry.lua
index d7df264a1bbb5b352fd49eae5f2d118b9d0e5a80..674727e42e4c4ced78d9594c660231e558dc0967 100644 (file)
--- a/src/plugins/lua/bayes_expiry.lua
+++ b/src/plugins/lua/bayes_expiry.lua
@@ -119,8 +119,8 @@ end
 
 rspamd_config:add_on_load(function (_, ev_base, worker)
   local processed_symbols, expire_script_sha
-  -- Exit unless we're the first 'normal' worker
-  if not (worker:get_name() == 'normal' and worker:get_index() == 0) then return end
+  -- Exit unless we're the first 'controller' worker
+  if not (worker:get_name() == 'controller' and worker:get_index() == 0) then return end
   -- Persist mempool variable to statefile on shutdown
   rspamd_config:register_finish_script(function ()
     local stamp = pool:get_variable(VAR_NAME, 'double')

diff --git a/src/plugins/lua/dmarc.lua b/src/plugins/lua/dmarc.lua
index 14b7804dc62dc6fa49b6268b69a4ccdcb902e437..b97881f9fa6bf5ba7209acac6c389a24cdc718eb 100644 (file)
--- a/src/plugins/lua/dmarc.lua
+++ b/src/plugins/lua/dmarc.lua
@@ -642,7 +642,7 @@ if opts['reporting'] == true then
     end
     rspamd_config:add_on_load(function(cfg, ev_base, worker)
       load_scripts(cfg, ev_base)
-      if not (worker:get_name() == 'normal' and worker:get_index() == 0) then return end
+      if not (worker:get_name() == 'controller' and worker:get_index() == 0) then return end
       local rresolver = rspamd_resolver.init(ev_base, rspamd_config)
       rspamd_config:register_finish_script(function ()
         local stamp = pool:get_variable(VAR_NAME, 'double')

diff --git a/src/plugins/lua/metric_exporter.lua b/src/plugins/lua/metric_exporter.lua
index 4951e65943a7adf48b66d56609f53925c2485c12..d104c4b9b0be063689a3de0d42e5a09ed290443c 100644 (file)
--- a/src/plugins/lua/metric_exporter.lua
+++ b/src/plugins/lua/metric_exporter.lua
@@ -169,8 +169,8 @@ end
 if not configure_metric_exporter() then return end
 
 rspamd_config:add_on_load(function (_, ev_base, worker)
-  -- Exit unless we're the first 'normal' worker
-  if not (worker:get_name() == 'normal' and worker:get_index() == 0) then return end
+  -- Exit unless we're the first 'controller' worker
+  if not (worker:get_name() == 'controller' and worker:get_index() == 0) then return end
   -- Persist mempool variable to statefile on shutdown
   rspamd_config:register_finish_script(function ()
     local stamp = pool:get_variable(VAR_NAME, 'double')