From: Oleg Babin <olegrok@tarantool.org>
To: Cyrill Gorcunov <gorcunov@gmail.com>,
tml <tarantool-patches@dev.tarantool.org>
Subject: Re: [Tarantool-patches] [PATCH v4 7/8] lua/log: allow to configure logging without a box
Date: Thu, 28 May 2020 13:42:14 +0300 [thread overview]
Message-ID: <cc54fa2f-7e18-a409-2ab7-2e6fefb4af73@tarantool.org> (raw)
In-Reply-To: <20200528100738.221911-8-gorcunov@gmail.com>
Hi! Thanks for your patch. See one comment below.
On 28/05/2020 13:07, Cyrill Gorcunov wrote:
> In the commit we allow to configure logger without
> calling box.cfg{}.
>
> Fixes #689
>
> @TarantoolBot document
> Title: Module log
>
> Module log allows to setup logger early without calling ``box.cfg()``.
> Configuration parameters are same as in ``box.cfg()`` call.
>
> Example
> ```
>> log = require('log')
>> log.cfg({log='filename', log_format='plain', log_level=6})
> ...
>> log.cfg({log_format='json', log_level=5})
> ```
>
> Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
> ---
> src/box/lua/load_cfg.lua | 13 +++--
> src/lua/log.lua | 117 +++++++++++++++++++++++++++++++++++++--
> 2 files changed, 119 insertions(+), 11 deletions(-)
>
> diff --git a/src/box/lua/load_cfg.lua b/src/box/lua/load_cfg.lua
> index 9aef12840..00e424156 100644
> --- a/src/box/lua/load_cfg.lua
> +++ b/src/box/lua/load_cfg.lua
> @@ -471,11 +471,13 @@ end
> local function apply_default_modules_cfg(cfg)
> --
> -- logging
> - for k,v in pairs(log.box_api.cfg) do
> - if cfg[k] == nil then
> - cfg[k] = v
> - end
> - end
> + log.box_api.cfg_apply_default(cfg)
> +end
> +
> +local function update_modules_cfg(cfg)
> + --
> + -- logging
> + log.box_api.cfg_update(cfg)
> end
>
> -- Return true if two configurations are equivalent.
> @@ -597,6 +599,7 @@ local function load_cfg(cfg)
> end
> end
> end
> + update_modules_cfg(cfg)
> if not box.cfg.read_only and not box.cfg.replication then
> box.schema.upgrade{auto = true}
> end
> diff --git a/src/lua/log.lua b/src/lua/log.lua
> index ce546f21e..31a80e18a 100644
> --- a/src/lua/log.lua
> +++ b/src/lua/log.lua
> @@ -97,6 +97,14 @@ local fmt_str2num = {
> ["json"] = ffi.C.SF_JSON,
> }
>
> +local function fmt_list()
> + local keyset = {}
> + for k in pairs(fmt_str2num) do
> + keyset[#keyset + 1] = k
> + end
> + return table.concat(keyset, ',')
> +end
> +
> --
> -- Default options. The keys are part of
> -- user API, so change with caution.
> @@ -162,18 +170,17 @@ local function log_rotate()
> end
>
> local function log_level(level)
> + if type(level) ~= 'number' then
> + error("log: 'level' (or 'log_level' option) expects a number")
> + end
Seems we could easily add an ability to specify log level as string.
log.cfg{log_level = 'info'} - it will be really more user-friendly than
currently.
Also it's possible to specify "invalid" numbers:
```
tarantool> require('log').cfg({log_level = 0/0})
---
...
tarantool> require('log').cfg
---
- log_format: json
log_level: nan
log_nonblock: false
...
```
I think we could restict levels from 0/1 to 7.
All available log_levels are exposed as `enum say_level` and you can use
it as you've done it for `say_format`s.
next prev parent reply other threads:[~2020-05-28 10:42 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
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 [this message]
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=cc54fa2f-7e18-a409-2ab7-2e6fefb4af73@tarantool.org \
--to=olegrok@tarantool.org \
--cc=gorcunov@gmail.com \
--cc=tarantool-patches@dev.tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH v4 7/8] lua/log: allow to configure logging without a box' \
/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