[Tarantool-patches] [PATCH v2 1/2] lua/log: remove 'module' option type

Roman Khabibov roman.habibov at tarantool.org
Tue Apr 13 15:45:58 MSK 2021


Assign lua types to log_* options instead of 'module' added in
a94a9b3. 'module' is no longer needed.

Needed for #5602
---
 src/box/lua/load_cfg.lua | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/box/lua/load_cfg.lua b/src/box/lua/load_cfg.lua
index 885a0cac1..f90ba8a9a 100644
--- a/src/box/lua/load_cfg.lua
+++ b/src/box/lua/load_cfg.lua
@@ -144,10 +144,10 @@ local template_cfg = {
     vinyl_page_size           = 'number',
     vinyl_bloom_fpr           = 'number',
 
-    log                 = 'module',
-    log_nonblock        = 'module',
-    log_level           = 'module',
-    log_format          = 'module',
+    log                 = 'string',
+    log_nonblock        = 'boolean',
+    log_level           = 'number',
+    log_format          = 'string',
 
     io_collect_interval = 'number',
     readahead           = 'number',
@@ -492,7 +492,7 @@ local function prepare_cfg(cfg, default_cfg, template_cfg,
             end
             v = prepare_cfg(v, default_cfg[k], template_cfg[k],
                             module_cfg[k], modify_cfg[k], readable_name)
-        elseif template_cfg[k] == 'module' then
+        elseif module_cfg[k] ~= nil then
             local old_value = module_cfg[k].cfg_get(k, v)
             module_cfg_backup[k] = old_value or box.NULL
 
-- 
2.24.3 (Apple Git-128)



More information about the Tarantool-patches mailing list