From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp44.i.mail.ru (smtp44.i.mail.ru [94.100.177.104]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 8CEDE469710 for ; Thu, 28 May 2020 13:37:18 +0300 (MSK) From: Oleg Babin References: <20200528100738.221911-1-gorcunov@gmail.com> <20200528100738.221911-4-gorcunov@gmail.com> Message-ID: <7f3ec60b-5bc8-45a1-e2f7-8ee8a9c3556d@tarantool.org> Date: Thu, 28 May 2020 13:37:11 +0300 MIME-Version: 1.0 In-Reply-To: <20200528100738.221911-4-gorcunov@gmail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 7bit Subject: Re: [Tarantool-patches] [PATCH v4 3/8] lua/log: put string constants to map List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Cyrill Gorcunov , tml Hi! Thanks for your patch. LGTM. On 28/05/2020 13:07, Cyrill Gorcunov wrote: > 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..d1d712cab 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 > >