[Tarantool-patches] [PATCH 09/10] lua/log: update log status via box.cfg call

[Cyrill Gorcunov]

When logger is configured via box.cfg{} call
we should preserve these settings to show them
back via `require('log').cfg` interface.

Part-of #689

Signed-off-by: Cyrill Gorcunov <gorcunov at gmail.com>
---
 src/box/lua/load_cfg.lua |  7 +++++++
 src/lua/log.lua          | 10 ++++++++++
 2 files changed, 17 insertions(+)

diff --git a/src/box/lua/load_cfg.lua b/src/box/lua/load_cfg.lua
index 3cc21bc02..5c3e3292f 100644
--- a/src/box/lua/load_cfg.lua
+++ b/src/box/lua/load_cfg.lua
@@ -478,6 +478,12 @@ local function apply_default_modules_cfg(cfg)
     end
 end
 
+local function update_modules_cfg(cfg)
+    --
+    -- logging
+    log.box_api.cfg_update(cfg)
+end
+
 -- Return true if two configurations are equivalent.
 local function compare_cfg(cfg1, cfg2)
     if type(cfg1) ~= type(cfg2) then
@@ -597,6 +603,7 @@ local function load_cfg(cfg)
             end
         end
     end
+    update_modules_cfg(cfg)
     if not box.cfg.read_only and not box.cfg.replication then
         box.schema.upgrade{auto = true}
     end
diff --git a/src/lua/log.lua b/src/lua/log.lua
index 675dfca22..ac85644fa 100644
--- a/src/lua/log.lua
+++ b/src/lua/log.lua
@@ -238,6 +238,15 @@ local function init(args)
     rawset(cfg, 'log_format', args.log_format)
 end
 
+--
+-- Reflect the changes made by box.cfg interface
+local function box_cfg_update(box_cfg)
+    rawset(cfg, 'log', box_cfg.log)
+    rawset(cfg, 'log_level', box_cfg.log_level)
+    rawset(cfg, 'log_nonblock', box_cfg.log_nonblock)
+    rawset(cfg, 'log_format', box_cfg.log_format)
+end
+
 local compat_warning_said = false
 local compat_v16 = {
     logger_pid = function()
@@ -271,6 +280,7 @@ return setmetatable({
         set_log_format = function()
             log_format(box.cfg.log_format)
         end,
+        cfg_update = box_cfg_update,
     }
 }, {
     __index = compat_v16;
-- 
2.26.2