From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from [87.239.111.99] (localhost [127.0.0.1]) by dev.tarantool.org (Postfix) with ESMTP id 8FCA96BD2D; Tue, 13 Apr 2021 17:53:47 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 8FCA96BD2D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1618325627; bh=AiTUmJfp+dfPDkrVLe3Zc3cHqbxF1/E4+kzY/uHEDuw=; h=To:References:Date:In-Reply-To:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=HeVMhiprJSmyc3A5yjWmf42f9kusn2DpWfHGb59WllJp2I8bMlyN23tHHdMiR3euF WS/AQ9NureemuzD7gkyoFI98iRt/tywXtnIq8AnGHzqycX5WeqxskNZWccXxNm3pe/ Wd2bqAssJMEbvFy0nd5E5q133V4vt20POLZF8dDU= Received: from smtp36.i.mail.ru (smtp36.i.mail.ru [94.100.177.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 82E486BD2D for ; Tue, 13 Apr 2021 17:53:45 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org 82E486BD2D Received: by smtp36.i.mail.ru with esmtpa (envelope-from ) id 1lWKQC-0004z2-U6; Tue, 13 Apr 2021 17:53:45 +0300 To: Roman Khabibov , tarantool-patches@dev.tarantool.org, Cyrill Gorcunov References: <20210413124559.47410-1-roman.habibov@tarantool.org> <20210413124559.47410-2-roman.habibov@tarantool.org> Message-ID: Date: Tue, 13 Apr 2021 17:52:11 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: <20210413124559.47410-2-roman.habibov@tarantool.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD92FFCB8E6708E7480257C85EA0BB7A95D0F00AE41BB9A5343182A05F538085040EA37B4E19A6B0483A3CFB718190FCF50DCECBCF2ADAB9990BCFEDBD8504F7D0C X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE75644E22E05AA81AEB287FD4696A6DC2FA8DF7F3B2552694A4E2F5AFA99E116B42401471946AA11AF23F8577A6DFFEA7CA0175C48BD57B26B8F08D7030A58E5ADC58D69EE07B14084F39EFFDF887939037866D6147AF826D833F7F9FC45A6A2E213E1706EB25D3447117882F4460429724CE54428C33FAD305F5C1EE8F4F765FC292D688DDAD4E7BC389733CBF5DBD5E9C8A9BA7A39EFB766F5D81C698A659EA7CC7F00164DA146DA9985D098DBDEAEC8C2B5EEE3591E0D35F6B57BC7E6449061A352F6E88A58FB86F5D81C698A659EA73AA81AA40904B5D9A18204E546F3947C6E16326BB14E90372D242C3BD2E3F4C64AD6D5ED66289B52698AB9A7B718F8C46E0066C2D8992A16725E5C173C3A84C37CB2176D36798DBBBA3038C0950A5D36B5C8C57E37DE458B0BC6067A898B09E46D1867E19FE1407959CC434672EE6371089D37D7C0E48F6C8AA50765F7900637E5B3C788B76394F7EFF80C71ABB335746BA297DBC24807EABDAD6C7F3747799A X-B7AD71C0: AC4F5C86D027EB782CDD5689AFBDA7A24209795067102C07E8F7B195E1C978311E42F8DBF002FD7AF4AFB5C2C7CD4746 X-C1DE0DAB: 0D63561A33F958A56CC5398AE520A2922BAE513287B1C2BC19847F3ED25F5576D59269BC5F550898D99A6476B3ADF6B47008B74DF8BB9EF7333BD3B22AA88B938A852937E12ACA7502E6951B79FF9A3F410CA545F18667F91A7EA1CDA0B5A7A0 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34753B45383CEFF204FAADBD6BDEE1C7D982BB011DE2880CDE7888E7F9DEFDA2A142C901A8B4976FCA1D7E09C32AA3244C4A4BB9AA49B099293D10F7643E81DF76CE0B41342B755BCDFACE5A9C96DEB163 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojnA7/qPBUIXFuAln0bbs9gw== X-Mailru-Sender: 48EFD2E18A91C559803250E574CC3D293FDB227E0ABFCBA7A3CFB718190FCF5081AE5054A97140B9D35D514C7DAC97282D063C67CFD4E84987597EC79699C0E6F21BD4036121A32F7402F9BA4338D657ED14614B50AE0675 X-Mras: Ok Subject: Re: [Tarantool-patches] [PATCH v2 1/2] lua/log: remove 'module' option type X-BeenThere: tarantool-patches@dev.tarantool.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Leonid Vasiliev via Tarantool-patches Reply-To: Leonid Vasiliev Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" Hi! Thank you for the patch. LGTM. Cyrill Gorcunov. please also see the patch. On 4/13/21 3:45 PM, Roman Khabibov via Tarantool-patches wrote: > 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 > >