From: Cyrill Gorcunov <gorcunov@gmail.com>
To: tml <tarantool-patches@dev.tarantool.org>
Cc: Alexander Turenko <alexander.turenko@tarantool.org>
Subject: [Tarantool-patches] [PATCH 09/10] lua/log: update log status via box.cfg call
Date: Mon, 25 May 2020 15:17:14 +0300 [thread overview]
Message-ID: <20200525121715.21216-10-gorcunov@gmail.com> (raw)
In-Reply-To: <20200525121715.21216-1-gorcunov@gmail.com>
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@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
next prev parent reply other threads:[~2020-05-25 12:19 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-25 12:17 [Tarantool-patches] [PATCH 00/10] lua/log: add an ability to setup logger without box.cfg{} Cyrill Gorcunov
2020-05-25 12:17 ` [Tarantool-patches] [PATCH 01/10] core/say: drop redundant declarations Cyrill Gorcunov
2020-05-25 12:17 ` [Tarantool-patches] [PATCH 02/10] core/say: drop vsay declaration Cyrill Gorcunov
2020-05-25 12:17 ` [Tarantool-patches] [PATCH 03/10] core/say: do not reconfig early set up logger Cyrill Gorcunov
2020-05-25 12:17 ` [Tarantool-patches] [PATCH 04/10] lua/log: declare say_logger_init and say_logger_initialized Cyrill Gorcunov
2020-05-25 12:17 ` [Tarantool-patches] [PATCH 05/10] lua/log: put string constants to map Cyrill Gorcunov
2020-05-25 12:17 ` [Tarantool-patches] [PATCH 06/10] lua/log: do not allow to set json for boot logger Cyrill Gorcunov
2020-05-25 12:17 ` [Tarantool-patches] [PATCH 07/10] lua/log: use log module settings inside box.cfg Cyrill Gorcunov
2020-05-25 15:43 ` Oleg Babin
2020-05-25 15:49 ` Cyrill Gorcunov
2020-05-25 12:17 ` [Tarantool-patches] [PATCH 08/10] lua/log: allow to configure logging without a box Cyrill Gorcunov
2020-05-25 12:17 ` Cyrill Gorcunov [this message]
2020-05-25 12:17 ` [Tarantool-patches] [PATCH 10/10] test: use direct log module Cyrill Gorcunov
2020-05-25 12:18 ` [Tarantool-patches] [PATCH 00/10] lua/log: add an ability to setup logger without box.cfg{} Cyrill Gorcunov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200525121715.21216-10-gorcunov@gmail.com \
--to=gorcunov@gmail.com \
--cc=alexander.turenko@tarantool.org \
--cc=tarantool-patches@dev.tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH 09/10] lua/log: update log status via box.cfg call' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox