From: Oleg Babin <olegrok@tarantool.org>
To: Cyrill Gorcunov <gorcunov@gmail.com>,
tml <tarantool-patches@dev.tarantool.org>
Subject: Re: [Tarantool-patches] [PATCH v8 05/12] lua/log: do not allow to set json for boot logger
Date: Wed, 3 Jun 2020 09:59:38 +0300 [thread overview]
Message-ID: <5c223f38-95ba-eb6f-4a45-68d8bf05e5e4@tarantool.org> (raw)
In-Reply-To: <20200602221817.645015-6-gorcunov@gmail.com>
Hi! Thanks for your changes. LGTM.
On 03/06/2020 01:18, 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 | 5 +++--
> 2 files changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/src/lua/log.lua b/src/lua/log.lua
> index 94d8ca46c..d5a99076d 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]))
> 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..222343908 100755
> --- a/test/app-tap/logger.test.lua
> +++ b/test/app-tap/logger.test.lua
> @@ -1,12 +1,13 @@
> #!/usr/bin/env tarantool
>
> local test = require('tap').test('log')
> -test:plan(24)
> +test:plan(25)
>
> -- gh-3946: Assertion failure when using log_format() before box.cfg()
> local log = require('log')
> -log.log_format('json')
> log.log_format('plain')
> +_, err = pcall(log.log_format, 'json')
> +test:ok(err:find("log_format: json can\'t be used") ~= nil)
>
> --
> -- Check that Tarantool creates ADMIN session for #! script
>
next prev parent reply other threads:[~2020-06-03 6:59 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-02 22:18 [Tarantool-patches] [PATCH v8 00/12] lua/log: add an ability to setup logger without box.cfg{} Cyrill Gorcunov
2020-06-02 22:18 ` [Tarantool-patches] [PATCH v8 01/12] core/say: do not reconfig early set up logger Cyrill Gorcunov
2020-06-02 22:18 ` [Tarantool-patches] [PATCH v8 02/12] core/say: use say_logger_initialized in say_logger_free Cyrill Gorcunov
2020-06-02 22:18 ` [Tarantool-patches] [PATCH v8 03/12] lua/log: declare say_logger_init and say_logger_initialized Cyrill Gorcunov
2020-06-02 22:18 ` [Tarantool-patches] [PATCH v8 04/12] lua/log: put string constants to map Cyrill Gorcunov
2020-06-02 22:18 ` [Tarantool-patches] [PATCH v8 05/12] lua/log: do not allow to set json for boot logger Cyrill Gorcunov
2020-06-03 6:59 ` Oleg Babin [this message]
2020-06-03 7:34 ` Cyrill Gorcunov
2020-06-03 9:44 ` Kirill Yukhin
2020-06-02 22:18 ` [Tarantool-patches] [PATCH v8 06/12] lua/log: declare log as separate variable Cyrill Gorcunov
2020-06-02 22:18 ` [Tarantool-patches] [PATCH v8 07/12] lua/log: use log module settings inside box.cfg Cyrill Gorcunov
2020-06-03 7:00 ` Oleg Babin
2020-06-02 22:18 ` [Tarantool-patches] [PATCH v8 08/12] lua/log: allow to configure logging without a box Cyrill Gorcunov
2020-06-03 7:01 ` Oleg Babin
2020-06-02 22:18 ` [Tarantool-patches] [PATCH v8 09/12] test: logger -- use log module directly Cyrill Gorcunov
2020-06-03 7:02 ` Oleg Babin
2020-06-02 22:18 ` [Tarantool-patches] [PATCH v8 10/12] log/lua: allow to specify logging level as a string Cyrill Gorcunov
2020-06-03 7:03 ` Oleg Babin
2020-06-02 22:18 ` [Tarantool-patches] [PATCH v8 11/12] lua/log: use log_cfg instead of ffi's instances Cyrill Gorcunov
2020-06-02 22:18 ` [Tarantool-patches] [PATCH v8 12/12] test: logger -- consider more cases Cyrill Gorcunov
2020-06-03 7:03 ` Oleg Babin
2020-06-03 6:59 ` [Tarantool-patches] [PATCH v8 00/12] lua/log: add an ability to setup logger without box.cfg{} Oleg Babin
2020-06-03 7:09 ` Oleg Babin
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=5c223f38-95ba-eb6f-4a45-68d8bf05e5e4@tarantool.org \
--to=olegrok@tarantool.org \
--cc=gorcunov@gmail.com \
--cc=tarantool-patches@dev.tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH v8 05/12] 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