From 61b2a08f5de3d72ee84dddb8d3ee23b66c821380 Mon Sep 17 00:00:00 2001
From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 18 May 2017 16:32:08 +0100
Subject: [PATCH] [Minor] Allow to use global functions modularly

---
 lualib/global_functions.lua | 43 ++++++++++++++++++++++++++++++++-----
 1 file changed, 38 insertions(+), 5 deletions(-)

diff --git a/lualib/global_functions.lua b/lualib/global_functions.lua
index e3c95c549..a557fa557 100644
--- a/lualib/global_functions.lua
+++ b/lualib/global_functions.lua
@@ -1,9 +1,11 @@
 local logger = require "rspamd_logger"
 
+local exports = {}
+
 -- This function parses redis server definition using either
 -- specific server string for this module or global
 -- redis section
-function rspamd_parse_redis_server(module_name)
+local function rspamd_parse_redis_server(module_name)
 
   local result = {}
   local default_port = 6379
@@ -115,6 +117,8 @@ function rspamd_parse_redis_server(module_name)
   end
 end
 
+exports.rspamd_parse_redis_server = rspamd_parse_redis_server
+
 -- Performs async call to redis hiding all complexity inside function
 -- task - rspamd_task
 -- redis_params - valid params returned by rspamd_parse_redis_server
@@ -123,7 +127,7 @@ end
 -- callback - function to be called upon request is completed
 -- command - redis command
 -- args - table of arguments
-function rspamd_redis_make_request(task, redis_params, key, is_write, callback, command, args)
+local function rspamd_redis_make_request(task, redis_params, key, is_write, callback, command, args)
   local addr
   local function rspamd_redis_make_request_cb(err, data)
     if err then
@@ -178,6 +182,8 @@ function rspamd_redis_make_request(task, redis_params, key, is_write, callback,
   return ret,conn,addr
 end
 
+exports.rspamd_redis_make_request = rspamd_redis_make_request
+
 local split_grammar = {}
 function rspamd_str_split(s, sep)
   local lpeg = require "lpeg"
@@ -416,7 +422,7 @@ local metafunctions = {
   },
 }
 
-function rspamd_gen_metatokens(task)
+local function rspamd_gen_metatokens(task)
   local ipairs = ipairs
   local metatokens = {}
   local cached = task:cache_get('metatokens')
@@ -438,7 +444,9 @@ function rspamd_gen_metatokens(task)
   return metatokens
 end
 
-function rspamd_count_metatokens()
+exports.rspamd_gen_metatokens = rspamd_gen_metatokens
+
+local function rspamd_count_metatokens()
   local ipairs = ipairs
   local total = 0
   for _,mt in ipairs(metafunctions) do
@@ -448,7 +456,9 @@ function rspamd_count_metatokens()
   return total
 end
 
-function rspamd_map_add(mname, optname, mtype, description)
+exports.rspamd_count_metatokens = rspamd_count_metatokens
+
+local function rspamd_map_add(mname, optname, mtype, description)
   local ret = {
     get_key = function(t, k)
       if t.__data then
@@ -576,3 +586,26 @@ function rspamd_map_add(mname, optname, mtype, description)
 
   return nil
 end
+
+exports.rspamd_map_add = rspamd_map_add
+
+-- a special syntax sugar to export all functions to the global table
+setmetatable(exports, {
+  __call = function(t, override)
+    for k, v in pairs(t) do
+      if _G[k] ~= nil then
+        local msg = 'function ' .. k .. ' already exists in global scope.'
+        if override then
+          _G[k] = v
+          logger.errx('WARNING: ' .. msg .. ' Overwritten.')
+        else
+          logger.errx('NOTICE: ' .. msg .. ' Skipped.')
+        end
+      else
+        _G[k] = v
+      end
+    end
+  end,
+})
+
+return exports
\ No newline at end of file
-- 
2.39.5