From: lvasiliev <lvasiliev@tarantool.org>
To: Cyrill Gorcunov <gorcunov@gmail.com>,
tml <tarantool-patches@dev.tarantool.org>
Subject: Re: [Tarantool-patches] [PATCH v4 4/8] lua/log: do not allow to set json for boot logger
Date: Thu, 28 May 2020 14:49:04 +0300 [thread overview]
Message-ID: <8353e47e-7e24-e60e-e2e9-bce5a5ea0757@tarantool.org> (raw)
In-Reply-To: <20200528100738.221911-5-gorcunov@gmail.com>
Hi! Thank you for the patch.
See comment below.
On 28.05.2020 13:07, Cyrill Gorcunov wrote:
> For some reason we've missed that say_set_log_format
> doesn't support json format not only for syslog but
> for boottime logging as well.
>
> Part-of #689
>
> Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
> ---
> src/lua/log.lua | 7 +++++--
> test/app-tap/logger.test.lua | 1 -
> 2 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/src/lua/log.lua b/src/lua/log.lua
> index d1d712cab..2491501f7 100644
> --- a/src/lua/log.lua
> +++ b/src/lua/log.lua
> @@ -160,8 +160,11 @@ local function log_format(name)
> 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")
> + if ffi.C.log_type() == ffi.C.SAY_LOGGER_SYSLOG or
> + ffi.C.log_type() == ffi.C.SAY_LOGGER_BOOT then
> + local m = "log_format: %s can't be used with " ..
> + "syslog or boot-time logger" > + error(m:format(fmt_num2str[ffi.C.SF_JSON]))
Why do you use the format if the message is always the same?
> end
> ffi.C.say_set_log_format(ffi.C.SF_JSON)
> else
> diff --git a/test/app-tap/logger.test.lua b/test/app-tap/logger.test.lua
> index 492d5ea0b..7bfa06e80 100755
> --- a/test/app-tap/logger.test.lua
> +++ b/test/app-tap/logger.test.lua
> @@ -5,7 +5,6 @@ test:plan(24)
>
> -- gh-3946: Assertion failure when using log_format() before box.cfg()
> local log = require('log')
> -log.log_format('json')
> log.log_format('plain')
>
> --
>
next prev parent reply other threads:[~2020-05-28 11:49 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
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 [this message]
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=8353e47e-7e24-e60e-e2e9-bce5a5ea0757@tarantool.org \
--to=lvasiliev@tarantool.org \
--cc=gorcunov@gmail.com \
--cc=tarantool-patches@dev.tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH v4 4/8] lua/log: do not allow to set json for boot logger' \
/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