From: Roman Khabibov via Tarantool-patches <tarantool-patches@dev.tarantool.org> To: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH v2 1/2] lua/log: remove 'module' option type Date: Tue, 13 Apr 2021 15:45:58 +0300 [thread overview] Message-ID: <20210413124559.47410-2-roman.habibov@tarantool.org> (raw) In-Reply-To: <20210413124559.47410-1-roman.habibov@tarantool.org> Assign lua types to log_* options instead of 'module' added in a94a9b3. 'module' is no longer needed. Needed for #5602 --- src/box/lua/load_cfg.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/box/lua/load_cfg.lua b/src/box/lua/load_cfg.lua index 885a0cac1..f90ba8a9a 100644 --- a/src/box/lua/load_cfg.lua +++ b/src/box/lua/load_cfg.lua @@ -144,10 +144,10 @@ local template_cfg = { vinyl_page_size = 'number', vinyl_bloom_fpr = 'number', - log = 'module', - log_nonblock = 'module', - log_level = 'module', - log_format = 'module', + log = 'string', + log_nonblock = 'boolean', + log_level = 'number', + log_format = 'string', io_collect_interval = 'number', readahead = 'number', @@ -492,7 +492,7 @@ local function prepare_cfg(cfg, default_cfg, template_cfg, end v = prepare_cfg(v, default_cfg[k], template_cfg[k], module_cfg[k], modify_cfg[k], readable_name) - elseif template_cfg[k] == 'module' then + elseif module_cfg[k] ~= nil then local old_value = module_cfg[k].cfg_get(k, v) module_cfg_backup[k] = old_value or box.NULL -- 2.24.3 (Apple Git-128)
next prev parent reply other threads:[~2021-04-13 12:46 UTC|newest] Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-04-13 12:45 [Tarantool-patches] [PATCH v2 0/2] Set cfg via environment variables Roman Khabibov via Tarantool-patches 2021-04-13 12:45 ` Roman Khabibov via Tarantool-patches [this message] 2021-04-13 14:52 ` [Tarantool-patches] [PATCH v2 1/2] lua/log: remove 'module' option type Leonid Vasiliev via Tarantool-patches 2021-04-13 15:03 ` Cyrill Gorcunov via Tarantool-patches 2021-04-13 15:42 ` Leonid Vasiliev via Tarantool-patches 2021-04-13 12:45 ` [Tarantool-patches] [PATCH v2 2/2] box: set cfg via environment variables Roman Khabibov via Tarantool-patches 2021-04-13 15:39 ` Leonid Vasiliev via Tarantool-patches 2021-04-13 17:57 ` Cyrill Gorcunov via Tarantool-patches
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=20210413124559.47410-2-roman.habibov@tarantool.org \ --to=tarantool-patches@dev.tarantool.org \ --cc=roman.habibov@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v2 1/2] lua/log: remove '\''module'\'' option type' \ /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