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 DCA636BD29; Tue, 13 Apr 2021 15:46:34 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org DCA636BD29 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tarantool.org; s=dev; t=1618317994; bh=e4gnT93ihktq8MRGA3u9SsYq46SNYzpZZCqONkI8sHA=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=YFf7KmaErL8E0n+RTEW7sUTqdXbwNEWaF5Khy9m5o79/aXPHjClUYFCL+zfYLJfSA 13Ec8J/OagkDSsE5cvlyKPQ6hshqdj5CQNdSRkQL1WdJ6VyciPqYGm012N36rtucI5 wgxRnOFX31PhKb7KLlNn+U+F1c9L9cSUHlCkowAg= Received: from smtpng2.m.smailru.net (smtpng2.m.smailru.net [94.100.179.3]) (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 B26AC6BD29 for ; Tue, 13 Apr 2021 15:46:02 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 dev.tarantool.org B26AC6BD29 Received: by smtpng2.m.smailru.net with esmtpa (envelope-from ) id 1lWIQc-0003Wr-7v; Tue, 13 Apr 2021 15:46:02 +0300 To: tarantool-patches@dev.tarantool.org Date: Tue, 13 Apr 2021 15:45:58 +0300 Message-Id: <20210413124559.47410-2-roman.habibov@tarantool.org> X-Mailer: git-send-email 2.24.3 (Apple Git-128) In-Reply-To: <20210413124559.47410-1-roman.habibov@tarantool.org> References: <20210413124559.47410-1-roman.habibov@tarantool.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-7564579A: B8F34718100C35BD X-77F55803: 4F1203BC0FB41BD92FFCB8E6708E74807BAE725B9AE625DE765B0E193B5B7687182A05F53808504070723CFB4AD2CB6E08B5579BFFB8B156E6A9733451F97D94C272A478A11D1753 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE7C27E92EFAD44F80DEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637D7F1BE85E7B0CA818638F802B75D45FF914D58D5BE9E6BC1A93B80C6DEB9DEE97C6FB206A91F05B2234E56AFA2D8209E1591F887A4D391D68CCF7685675CC1A7D2E47CDBA5A96583C09775C1D3CA48CF253F27DA5A70FAF3117882F4460429724CE54428C33FAD30A8DF7F3B2552694AC26CFBAC0749D213D2E47CDBA5A9658378DA827A17800CE709B92020B71E24959FA2833FD35BB23DF004C906525384302BEBFE083D3B9BA73A03B725D353964B0B7D0EA88DDEDAC722CA9DD8327EE493B89ED3C7A6281781156CCFE7AF13BCA4B5C8C57E37DE458BEDA766A37F9254B7 X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975CB69F9342289A40B36D7ECED71A98CF7301893898BF5C62539C2B6934AE262D3EE7EAB7254005DCED7532B743992DF240BDC6A1CF3F042BAD6DF99611D93F60EF0417BEADF48D1460699F904B3F4130E343918A1A30D5E7FCCB5012B2E24CD356 X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D34103A2CD2CFC42C67E3907F22117A974ABC4C640DC90D1EF3DEE60EA245C41788C9A309B94D9102D01D7E09C32AA3244C37431F316488BC1E6D29C90F4B26305560759606DA2E136A729B2BEF169E0186 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2biojbL9S8ysBdXg6vKRI8coPsQS+qARivYBC X-Mailru-Sender: 689FA8AB762F73936BC43F508A063822DBF9A9208AE930DF87ABA530BAA1332B0F96A0E8EF440D4CA021B31A5B48C7CFFB559BB5D741EB9609AE011F3211FEEF240331F90058701C67EA787935ED9F1B X-Mras: Ok Subject: [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: Roman Khabibov via Tarantool-patches Reply-To: Roman Khabibov Errors-To: tarantool-patches-bounces@dev.tarantool.org Sender: "Tarantool-patches" 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)