From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-f172.google.com (mail-lj1-f172.google.com [209.85.208.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id E20DC45C310 for ; Mon, 25 May 2020 15:19:03 +0300 (MSK) Received: by mail-lj1-f172.google.com with SMTP id z6so20483712ljm.13 for ; Mon, 25 May 2020 05:19:03 -0700 (PDT) From: Cyrill Gorcunov Date: Mon, 25 May 2020 15:17:14 +0300 Message-Id: <20200525121715.21216-10-gorcunov@gmail.com> In-Reply-To: <20200525121715.21216-1-gorcunov@gmail.com> References: <20200525121715.21216-1-gorcunov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH 09/10] lua/log: update log status via box.cfg call List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tml Cc: Alexander Turenko 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 --- 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