From: Oleg Babin <olegrok@tarantool.org>
To: Cyrill Gorcunov <gorcunov@gmail.com>,
tml <tarantool-patches@dev.tarantool.org>
Subject: Re: [Tarantool-patches] [PATCH v4 3/8] lua/log: put string constants to map
Date: Thu, 28 May 2020 13:37:11 +0300 [thread overview]
Message-ID: <7f3ec60b-5bc8-45a1-e2f7-8ee8a9c3556d@tarantool.org> (raw)
In-Reply-To: <20200528100738.221911-4-gorcunov@gmail.com>
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 <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..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
>
>
next prev parent reply other threads:[~2020-05-28 10:37 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-28 10:07 [Tarantool-patches] [PATCH v4 0/8] lua/log: add an ability to setup logger without box.cfg{} Cyrill Gorcunov
2020-05-28 10:07 ` [Tarantool-patches] [PATCH v4 1/8] core/say: do not reconfig early set up logger Cyrill Gorcunov
2020-05-28 10:36 ` Oleg Babin
2020-05-28 10:42 ` lvasiliev
2020-05-28 10:47 ` Cyrill Gorcunov
2020-05-28 10:07 ` [Tarantool-patches] [PATCH v4 2/8] lua/log: declare say_logger_init and say_logger_initialized Cyrill Gorcunov
2020-05-28 10:37 ` Oleg Babin
2020-05-28 11:12 ` lvasiliev
2020-05-28 11:16 ` Cyrill Gorcunov
2020-05-28 10:07 ` [Tarantool-patches] [PATCH v4 3/8] lua/log: put string constants to map Cyrill Gorcunov
2020-05-28 10:37 ` Oleg Babin [this message]
2020-05-28 12:46 ` lvasiliev
2020-05-28 10:07 ` [Tarantool-patches] [PATCH v4 4/8] lua/log: do not allow to set json for boot logger Cyrill Gorcunov
2020-05-28 10:40 ` Oleg Babin
2020-05-28 10:48 ` Cyrill Gorcunov
2020-05-28 11:49 ` lvasiliev
2020-05-28 11:59 ` Cyrill Gorcunov
2020-05-28 10:07 ` [Tarantool-patches] [PATCH v4 5/8] lua/log: declare log as separate variable Cyrill Gorcunov
2020-05-28 10:40 ` Oleg Babin
2020-05-28 12:57 ` lvasiliev
2020-05-28 10:07 ` [Tarantool-patches] [PATCH v4 6/8] lua/log: use log module settings inside box.cfg Cyrill Gorcunov
2020-05-28 10:41 ` Oleg Babin
2020-05-28 10:49 ` Cyrill Gorcunov
2020-05-28 17:07 ` lvasiliev
2020-05-28 17:34 ` Cyrill Gorcunov
2020-05-29 8:43 ` Leonid Vasiliev
2020-05-28 10:07 ` [Tarantool-patches] [PATCH v4 7/8] lua/log: allow to configure logging without a box Cyrill Gorcunov
2020-05-28 10:42 ` Oleg Babin
2020-05-29 8:41 ` Leonid Vasiliev
2020-05-29 8:53 ` Oleg Babin
2020-05-29 9:16 ` Leonid Vasiliev
2020-05-29 9:49 ` Cyrill Gorcunov
2020-05-29 10:00 ` Oleg Babin
2020-05-29 10:22 ` Leonid Vasiliev
2020-05-29 10:38 ` Cyrill Gorcunov
2020-05-29 11:08 ` Leonid Vasiliev
2020-05-29 11:32 ` Cyrill Gorcunov
2020-05-29 11:39 ` Leonid Vasiliev
2020-05-29 10:07 ` Cyrill Gorcunov
2020-05-28 10:07 ` [Tarantool-patches] [PATCH v4 8/8] test: use direct log module Cyrill Gorcunov
2020-05-28 10:42 ` Oleg Babin
2020-05-28 10:50 ` Cyrill Gorcunov
2020-05-29 9:02 ` Leonid Vasiliev
2020-05-29 11:31 ` [Tarantool-patches] [PATCH v4 0/8] lua/log: add an ability to setup logger without box.cfg{} Leonid Vasiliev
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=7f3ec60b-5bc8-45a1-e2f7-8ee8a9c3556d@tarantool.org \
--to=olegrok@tarantool.org \
--cc=gorcunov@gmail.com \
--cc=tarantool-patches@dev.tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH v4 3/8] 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