[Refactor] Rename all lua libraries in the common way

diff --git a/lualib/global_functions.lua b/lualib/global_functions.lua
index 956db8bed51ea01fd672adab4157dc4d94322cba..05c967534a70a2771549335e1b1bbc029d8cd354 100644 (file)
--- a/lualib/global_functions.lua
+++ b/lualib/global_functions.lua
@@ -17,8 +17,8 @@ limitations under the License.
 local logger = require "rspamd_logger"
 local lua_util = require "lua_util"
 local lua_redis = require "lua_redis"
-local meta_functions = require "meta_functions"
-local maps = require "maps"
+local meta_functions = require "lua_meta"
+local maps = require "lua_maps"
 
 local exports = {}
 

diff --git a/lualib/auth_results.lua b/lualib/lua_auth_results.lua
similarity index 100%
rename from lualib/auth_results.lua
rename to lualib/lua_auth_results.lua

diff --git a/lualib/rspamd_config_transform.lua b/lualib/lua_cfg_transform.lua
similarity index 100%
rename from lualib/rspamd_config_transform.lua
rename to lualib/lua_cfg_transform.lua

diff --git a/lualib/dkim_sign_tools.lua b/lualib/lua_dkim_tools.lua
similarity index 100%
rename from lualib/dkim_sign_tools.lua
rename to lualib/lua_dkim_tools.lua

diff --git a/lualib/maps.lua b/lualib/lua_maps.lua
similarity index 100%
rename from lualib/maps.lua
rename to lualib/lua_maps.lua

diff --git a/lualib/meta_functions.lua b/lualib/lua_meta.lua
similarity index 100%
rename from lualib/meta_functions.lua
rename to lualib/lua_meta.lua

diff --git a/lualib/stat_tools.lua b/lualib/lua_stat.lua
similarity index 100%
rename from lualib/stat_tools.lua
rename to lualib/lua_stat.lua

diff --git a/lualib/rspamadm/configwizard.lua b/lualib/rspamadm/configwizard.lua
index a86bb78ec0f1d1bc2a5241787059ee9118568cce..fc9005ce0a19292b9cb2b93b566a28025bd1b330 100644 (file)
--- a/lualib/rspamadm/configwizard.lua
+++ b/lualib/rspamadm/configwizard.lua
@@ -19,7 +19,7 @@ local local_conf = rspamd_paths['CONFDIR']
 local rspamd_util = require "rspamd_util"
 local rspamd_logger = require "rspamd_logger"
 local lua_util = require "lua_util"
-local lua_stat_tools = require "stat_tools"
+local lua_stat_tools = require "lua_stat"
 local lua_redis = require "lua_redis"
 local ucl = require "ucl"
 

diff --git a/lualib/rspamadm/stat_convert.lua b/lualib/rspamadm/stat_convert.lua
index f70581fa4282784a1785f808e83567697498d67d..6ad3b0332dcacff8559d94812d6550cbe54728d1 100644 (file)
--- a/lualib/rspamadm/stat_convert.lua
+++ b/lualib/rspamadm/stat_convert.lua
@@ -1,5 +1,5 @@
 local lua_redis = require "lua_redis"
-local stat_tools = require "stat_tools"
+local stat_tools = require "lua_stat"
 local ucl = require "ucl"
 local logger = require "rspamd_logger"
 

diff --git a/src/libserver/cfg_rcl.c b/src/libserver/cfg_rcl.c
index 889bc7072e572f1c8b53aecde52133f342e6781c..97148d22bcd477035214c013762b54ae69883194 100644 (file)
--- a/src/libserver/cfg_rcl.c
+++ b/src/libserver/cfg_rcl.c
@@ -3549,7 +3549,7 @@ rspamd_rcl_maybe_apply_lua_transform (struct rspamd_config *cfg)
        gint err_idx, ret;
        GString *tb;
        gchar str[PATH_MAX];
-       static const char *transform_script = "rspamd_config_transform";
+       static const char *transform_script = "lua_cfg_transform";
 
        g_assert (L != NULL);
 

diff --git a/src/plugins/lua/arc.lua b/src/plugins/lua/arc.lua
index c87946aff6115537d3a6e4cb904c964f63b45da0..29faa12589c6d27c3f1cf73201742af5bea120f7 100644 (file)
--- a/src/plugins/lua/arc.lua
+++ b/src/plugins/lua/arc.lua
@@ -16,12 +16,12 @@ limitations under the License.
 
 local rspamd_logger = require "rspamd_logger"
 local lua_util = require "lua_util"
-local dkim_sign_tools = require "dkim_sign_tools"
+local dkim_sign_tools = require "lua_dkim_tools"
 local rspamd_util = require "rspamd_util"
 local rspamd_rsa_privkey = require "rspamd_rsa_privkey"
 local rspamd_rsa = require "rspamd_rsa"
 local fun = require "fun"
-local auth_results = require "auth_results"
+local auth_results = require "lua_auth_results"
 local hash = require "rspamd_cryptobox_hash"
 
 if confighelp then

diff --git a/src/plugins/lua/dkim_signing.lua b/src/plugins/lua/dkim_signing.lua
index 75720df9dad11ab0beff199f81813b97e875029c..de9a286ff74054708dc1ccbdb753450e24e1e8f3 100644 (file)
--- a/src/plugins/lua/dkim_signing.lua
+++ b/src/plugins/lua/dkim_signing.lua
@@ -17,7 +17,7 @@ limitations under the License.
 
 local lutil = require "lua_util"
 local rspamd_logger = require "rspamd_logger"
-local dkim_sign_tools = require "dkim_sign_tools"
+local dkim_sign_tools = require "lua_dkim_tools"
 local rspamd_util = require "rspamd_util"
 
 if confighelp then

diff --git a/src/plugins/lua/fann_redis.lua b/src/plugins/lua/fann_redis.lua
index 3120d8b181db07ce73f2d26bc79c998379ec65a2..828060240605c161676f9437df4647d148093e39 100644 (file)
--- a/src/plugins/lua/fann_redis.lua
+++ b/src/plugins/lua/fann_redis.lua
@@ -27,7 +27,7 @@ local rspamd_util = require "rspamd_util"
 local rspamd_redis = require "lua_redis"
 local lua_util = require "lua_util"
 local fun = require "fun"
-local meta_functions = require "meta_functions"
+local meta_functions = require "lua_meta"
 local use_torch = false
 local torch
 local nn

diff --git a/src/plugins/lua/milter_headers.lua b/src/plugins/lua/milter_headers.lua
index a0cca43d32742866910306790f6a21444074f95b..176597b602397fc4dd8cc43d1e620fb5ecdd69af 100644 (file)
--- a/src/plugins/lua/milter_headers.lua
+++ b/src/plugins/lua/milter_headers.lua
@@ -350,7 +350,7 @@ local function milter_headers(task)
 
   routines['authentication-results'] = function()
     if skip_wanted('authentication-results') then return end
-    local ar = require "auth_results"
+    local ar = require "lua_auth_results"
 
     if settings.routines['authentication-results'].remove then
       remove[settings.routines['authentication-results'].header] =

diff --git a/src/plugins/lua/ratelimit.lua b/src/plugins/lua/ratelimit.lua
index f77e2ae767962b333ba6100d72c65e37dee4b630..d18b79bfe861be7133e023aafe4d473e20d24438 100644 (file)
--- a/src/plugins/lua/ratelimit.lua
+++ b/src/plugins/lua/ratelimit.lua
@@ -50,7 +50,7 @@ local rspamd_util = require "rspamd_util"
 local rspamd_lua_utils = require "lua_util"
 local lua_redis = require "lua_redis"
 local fun = require "fun"
-local lua_maps = require "maps"
+local lua_maps = require "lua_maps"
 local lua_util = require "lua_util"
 
 local user_keywords = {'user'}

diff --git a/src/plugins/lua/reputation.lua b/src/plugins/lua/reputation.lua
index 0d870eee8115b52666fe349fca88ee0635906dbd..9c5f2aaadb171109f803bb32fa7fdaed61250301 100644 (file)
--- a/src/plugins/lua/reputation.lua
+++ b/src/plugins/lua/reputation.lua
@@ -26,7 +26,7 @@ local N = 'reputation'
 local rspamd_logger = require "rspamd_logger"
 local rspamd_util = require "rspamd_util"
 local lua_util = require "lua_util"
-local lua_maps = require "maps"
+local lua_maps = require "lua_maps"
 local hash = require 'rspamd_cryptobox_hash'
 local fun = require "fun"
 local redis_params = nil

diff --git a/src/plugins/lua/settings.lua b/src/plugins/lua/settings.lua
index 1963f9d70ce92436ecf8aa11cbfcb6fde514349b..d35c91adffbda49e15e2361a645bb3bb6910ece7 100644 (file)
--- a/src/plugins/lua/settings.lua
+++ b/src/plugins/lua/settings.lua
@@ -23,7 +23,7 @@ end
 -- https://rspamd.com/doc/configuration/settings.html
 
 local rspamd_logger = require "rspamd_logger"
-local rspamd_maps = require "maps"
+local rspamd_maps = require "lua_maps"
 local redis_params
 
 local settings = {}