commit 29031d7: Rename exported to be more explicit

GitHub noreply at github.com
Tue Aug 15 14:56:05 UTC 2023


Author: Jason Lingohr
Date: 2023-08-15 17:00:39 +1000
URL: https://github.com/rspamd/rspamd/commit/29031d73e69536448628c35f89471d44a7b66839 (refs/pull/4572/head)

Rename exported to be more explicit

---
 src/plugins/lua/metadata_exporter.lua | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/plugins/lua/metadata_exporter.lua b/src/plugins/lua/metadata_exporter.lua
index eafb9c85c..7b353b8d2 100644
--- a/src/plugins/lua/metadata_exporter.lua
+++ b/src/plugins/lua/metadata_exporter.lua
@@ -357,10 +357,10 @@ local pushers = {
       timeout = rule.timeout or settings.timeout,
     }, formatted, sendmail_cb)
   end,
-  json_raw = function(task, formatted, rule)
-    local function json_raw_callback(err, code)
+  json_raw_tcp = function(task, formatted, rule)
+    local function json_raw_tcp_callback(err, code)
       if err then
-        rspamd_logger.errx(task, 'got error %s in json_raw callback', err)
+        rspamd_logger.errx(task, 'got error %s in json_raw_tcp callback', err)
         return maybe_defer(task, rule)
       end
       return true
@@ -370,7 +370,7 @@ local pushers = {
       host=rule.host,
       port=rule.port,
       data=formatted,
-      callback=json_raw_callback,
+      callback=json_raw_tcp_callback,
       read=false,
     })
   end,
@@ -552,18 +552,18 @@ if type(settings.rules) ~= 'table' then
       settings.rules[r.backend:upper()] = r
     end
   end
-  if settings.pusher_enabled.json_raw then
+  if settings.pusher_enabled.json_raw_tcp then
     if not (settings.host and settings.port) then
       rspamd_logger.errx(rspamd_config, 'No host and/or port is specified')
-      settings.pusher_enabled.json_raw = nil
+      settings.pusher_enabled.json_raw_tcp = nil
     else
       local r = {}
-      r.backend = 'json_raw'
+      r.backend = 'json_raw_tcp'
       r.host = settings.host
       r.port = settings.port
       r.defer = settings.defer
-      r.selector = settings.pusher_select.json_raw
-      r.formatter = settings.pusher_format.json_raw
+      r.selector = settings.pusher_select.json_raw_tcp
+      r.formatter = settings.pusher_format.json_raw_tcp
       settings.rules[r.backend:upper()] = r
     end
   end
@@ -590,7 +590,7 @@ local backend_required_elements = {
   redis_pubsub = {
     'channel',
   },
-  json_raw = {
+  json_raw_tcp = {
     'host',
     'port',
   },


More information about the Commits mailing list