From: Cyrill Gorcunov <gorcunov@gmail.com> To: tml <tarantool-patches@dev.tarantool.org> Cc: Alexander Turenko <alexander.turenko@tarantool.org> Subject: [Tarantool-patches] [PATCH 08/10] lua/log: allow to configure logging without a box Date: Mon, 25 May 2020 15:17:13 +0300 [thread overview] Message-ID: <20200525121715.21216-9-gorcunov@gmail.com> (raw) In-Reply-To: <20200525121715.21216-1-gorcunov@gmail.com> Now a user can configure logging without running `box.cfg{}`. The syntax is the same as in `box.cfg{}` call. Fixes #689 Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> --- src/lua/log.lua | 55 ++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 50 insertions(+), 5 deletions(-) diff --git a/src/lua/log.lua b/src/lua/log.lua index b26a7afe5..675dfca22 100644 --- a/src/lua/log.lua +++ b/src/lua/log.lua @@ -97,6 +97,14 @@ local fmt_str2num = { ["json"] = ffi.C.SF_JSON, } +local function fmt_list() + local keyset = {} + for k,_ in pairs(fmt_str2num) do + keyset[#keyset+1] = k + end + return table.concat(keyset,',') +end + -- -- Default options. The keys are part of -- user API, so change with caution. @@ -168,12 +176,8 @@ end local function log_format(name) if not fmt_str2num[name] then - local keyset = {} - for k,_ in pairs(fmt_str2num) do - keyset[#keyset+1] = k - end local m = "log_format: expected %s" - error(m:format(table.concat(keyset,','))) + error(m:format(fmt_list())) end if fmt_str2num[name] == ffi.C.SF_JSON then @@ -194,6 +198,46 @@ local function log_pid() return tonumber(ffi.C.log_pid) end +-- +-- Initialize logger early (if not yet set up +-- via box.cfg interface. +-- +local function init(args) + if ffi.C.say_logger_initialized() == true then + error("log: the logger is already initialized") + end + + args = args or {} + + if args.log_format ~= nil then + if fmt_str2num[args.log_format] == nil then + local m = "log: 'log_format' must be %s" + error(m:format(fmt_list())) + end + else + args.log_format = cfg.log_format + end + + args.log_level = args.log_level or cfg.log_level + + args.log_nonblock = args.log_nonblock or (cfg.log_nonblock or false) + + -- + -- We never allow confgure the logger in background + -- mode since we don't know how the box will be configured + -- later. + ffi.C.say_logger_init(args.log, args.log_level, + args.log_nonblock, args.log_format, 0) + + -- + -- Update cfg vars to show them in module + -- configuration output. + rawset(cfg, 'log', args.log) + rawset(cfg, 'log_level', args.log_level) + rawset(cfg, 'log_nonblock', args.log_nonblock) + rawset(cfg, 'log_format', args.log_format) +end + local compat_warning_said = false local compat_v16 = { logger_pid = function() @@ -216,6 +260,7 @@ return setmetatable({ level = log_level; log_format = log_format; cfg = cfg, + init = init, -- -- Internal API to box module, not for users, -- names can be changed. -- 2.26.2
next prev parent reply other threads:[~2020-05-25 12:18 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 ` Cyrill Gorcunov [this message] 2020-05-25 12:17 ` [Tarantool-patches] [PATCH 09/10] lua/log: update log status via box.cfg call Cyrill Gorcunov 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-9-gorcunov@gmail.com \ --to=gorcunov@gmail.com \ --cc=alexander.turenko@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 08/10] lua/log: allow to configure logging without a box' \ /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