From: Cyrill Gorcunov <gorcunov@gmail.com> To: tml <tarantool-patches@dev.tarantool.org> Subject: [Tarantool-patches] [PATCH 2/3] lua/log: allow to use json formatter early Date: Mon, 29 Jun 2020 14:23:18 +0300 [thread overview] Message-ID: <20200629112319.154909-3-gorcunov@gmail.com> (raw) In-Reply-To: <20200629112319.154909-1-gorcunov@gmail.com> There is no reason to not allow for json formatter on early logging stage. Fixes #5121 Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> --- src/lua/log.lua | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/lua/log.lua b/src/lua/log.lua index bed690526..66fdaca7b 100644 --- a/src/lua/log.lua +++ b/src/lua/log.lua @@ -203,10 +203,8 @@ local function verify_format(key, name) end if fmt_str2num[name] == ffi.C.SF_JSON then - if ffi.C.log_type() == ffi.C.SAY_LOGGER_SYSLOG or - ffi.C.log_type() == ffi.C.SAY_LOGGER_BOOT then - local m = "%s can't be used with " .. - "syslog or boot-time logger" + if ffi.C.log_type() == ffi.C.SAY_LOGGER_SYSLOG then + local m = "%s can't be used with syslog logger" return false, m:format(fmt_num2str[ffi.C.SF_JSON]) end end -- 2.26.2
next prev parent reply other threads:[~2020-06-29 11:23 UTC|newest] Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-06-29 11:23 [Tarantool-patches] [PATCH 0/3] log: allow json formatter in boottime logger Cyrill Gorcunov 2020-06-29 11:23 ` [Tarantool-patches] [PATCH 1/3] core/say: allow to use json in boot logger Cyrill Gorcunov 2020-06-29 11:23 ` Cyrill Gorcunov [this message] 2020-06-29 11:23 ` [Tarantool-patches] [PATCH 3/3] test: app-tap/logger -- test json in boottime logger Cyrill Gorcunov 2020-06-29 12:50 ` [Tarantool-patches] [PATCH 0/3] log: allow json formatter " Oleg Babin 2020-06-29 13:37 ` Cyrill Gorcunov 2020-07-02 11:26 ` Kirill Yukhin 2020-06-30 16:02 [Tarantool-patches] [PATCH v2 " Cyrill Gorcunov 2020-06-30 16:02 ` [Tarantool-patches] [PATCH 2/3] lua/log: allow to use json formatter early Cyrill Gorcunov 2020-07-01 10:01 ` Oleg Babin 2020-07-02 7:27 ` Cyrill Gorcunov 2020-07-02 7:35 ` 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=20200629112319.154909-3-gorcunov@gmail.com \ --to=gorcunov@gmail.com \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 2/3] lua/log: allow to use json formatter early' \ /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