From: Cyrill Gorcunov <gorcunov@gmail.com> To: tml <tarantool-patches@dev.tarantool.org> Cc: Alexander Turenko <alexander.turenko@tarantool.org> Subject: [Tarantool-patches] [PATCH 05/10] lua/log: put string constants to map Date: Mon, 25 May 2020 15:17:10 +0300 [thread overview] Message-ID: <20200525121715.21216-6-gorcunov@gmail.com> (raw) In-Reply-To: <20200525121715.21216-1-gorcunov@gmail.com> This allows us to reuse them instead of copying opencoded constants. They are highly bound to ones compiled into the C code. Part-of #689 Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> --- src/lua/log.lua | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/src/lua/log.lua b/src/lua/log.lua index 9830b0886..3fceb1d0e 100644 --- a/src/lua/log.lua +++ b/src/lua/log.lua @@ -83,6 +83,20 @@ local special_fields = { "error_msg" } +-- +-- Map format number to string. +local fmt_num2str = { + [ffi.C.SF_PLAIN] = "plain", + [ffi.C.SF_JSON] = "json", +} + +-- +-- Map format string to number. +local fmt_str2num = { + ["plain"] = ffi.C.SF_PLAIN, + ["json"] = ffi.C.SF_JSON, +} + local function say(level, fmt, ...) if ffi.C.log_level < level then -- don't waste cycles on debug.getinfo() @@ -104,7 +118,7 @@ local function say(level, fmt, ...) fmt = json.encode(fmt) if ffi.C.log_format == ffi.C.SF_JSON then -- indicate that message is already encoded in JSON - format = "json" + format = fmt_num2str[ffi.C.SF_JSON] end elseif type_fmt ~= 'string' then fmt = tostring(fmt) @@ -135,16 +149,23 @@ local function log_level(level) return ffi.C.say_set_log_level(level) end -local function log_format(format_name) - if format_name == "json" then +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,','))) + end + + if fmt_str2num[name] == ffi.C.SF_JSON then if ffi.C.log_type() == ffi.C.SAY_LOGGER_SYSLOG then error("log_format: 'json' can't be used with syslog logger") end ffi.C.say_set_log_format(ffi.C.SF_JSON) - elseif format_name == "plain" then - ffi.C.say_set_log_format(ffi.C.SF_PLAIN) else - error("log_format: expected 'json' or 'plain'") + ffi.C.say_set_log_format(ffi.C.SF_PLAIN) end end -- 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 ` Cyrill Gorcunov [this message] 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 ` [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-6-gorcunov@gmail.com \ --to=gorcunov@gmail.com \ --cc=alexander.turenko@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 05/10] lua/log: put string constants to map' \ /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