From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-f195.google.com (mail-lj1-f195.google.com [209.85.208.195]) (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 684324696C0 for ; Tue, 26 May 2020 15:47:28 +0300 (MSK) Received: by mail-lj1-f195.google.com with SMTP id c11so22145403ljn.2 for ; Tue, 26 May 2020 05:47:28 -0700 (PDT) From: Cyrill Gorcunov Date: Tue, 26 May 2020 15:46:22 +0300 Message-Id: <20200526124627.82843-6-gorcunov@gmail.com> In-Reply-To: <20200526124627.82843-1-gorcunov@gmail.com> References: <20200526124627.82843-1-gorcunov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH v2 05/10] lua/log: put string constants to map List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tml Cc: Alexander Turenko 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 --- 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