From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp17.mail.ru (smtp17.mail.ru [94.100.176.154]) (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 1D390469711 for ; Tue, 12 May 2020 12:52:39 +0300 (MSK) From: sergeyb@tarantool.org Date: Tue, 12 May 2020 12:49:57 +0300 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH v5 03/10] Fix luacheck warnings in extra/dist/tarantoolctl.in List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tarantool-patches@dev.tarantool.org Cc: Vladislav Shpilevoy , o.piskunov@tarantool.org From: Sergey Bronnikov Closes #4681 Reviewed-by: Vladislav Shpilevoy Reviewed-by: Igor Munkin Co-authored-by: Vladislav Shpilevoy Co-authored-by: Igor Munkin --- .luacheckrc | 5 +++++ extra/dist/tarantoolctl.in | 33 +++++++++++---------------------- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/.luacheckrc b/.luacheckrc index 2683c8c26..f39502063 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -24,3 +24,8 @@ exclude_files = { ".rocks/**/*.lua", ".git/**/*.lua", } + +files["extra/dist/tarantoolctl.in"] = { + globals = {"box", "_TARANTOOL"}, + ignore = {"212/self", "122", "431"} +} diff --git a/extra/dist/tarantoolctl.in b/extra/dist/tarantoolctl.in index a98c61b52..1514f0037 100755 --- a/extra/dist/tarantoolctl.in +++ b/extra/dist/tarantoolctl.in @@ -63,13 +63,12 @@ end local function check_user_level() local uid = os.getenv('UID') - local udir = nil if uid == 0 or os.getenv("NOTIFY_SOCKET") then return nil end -- local dir configuration local pwd = os.getenv('PWD') - udir = pwd and pwd .. '/.tarantoolctl' + local udir = pwd and pwd .. '/.tarantoolctl' udir = udir and fio.stat(udir) and udir or nil -- or home dir configuration local homedir = os.getenv('HOME') @@ -126,15 +125,15 @@ end local function load_default_file(default_file) if default_file then local env = setmetatable({}, { __index = _G }) - local ufunc, msg = loadfile(default_file) + local ufunc, loaderr = loadfile(default_file) -- if load fails - show the last 10 lines of the log file if not ufunc then - log.error("Failed to load defaults file: %s", msg) + log.error("Failed to load defaults file: %s", loaderr) end debug.setfenv(ufunc, env) - local state, msg = pcall(ufunc) + local state, err = pcall(ufunc) if not state then - log.error('Failed to execute defaults file: %s', msg) + log.error('Failed to execute defaults file: %s', err) end default_cfg = env.default_cfg instance_dir = env.instance_dir @@ -789,7 +788,7 @@ end local function eval() local console_sock_path = uri.parse(console_sock).service local filename = arg[3] - local code = nil + local code if filename == nil then if stdin_isatty() then log.error("Usage:") @@ -847,7 +846,6 @@ end -- xlog / snap file, so even when it stops on LSN >= @a opts.to on -- a current file a next file will be processed. local function filter_xlog(gen, param, state, opts, cb) - local spaces = opts.spaces local from, to, spaces = opts.from, opts.to, opts.space local show_system, replicas = opts['show-system'], opts.replica @@ -861,7 +859,7 @@ local function filter_xlog(gen, param, state, opts, cb) elseif (lsn < from) or (lsn >= to) or (not spaces and sid and sid < 512 and not show_system) or (spaces and (sid == nil or not find_in_list(sid, spaces))) or - (replicas and not find_in_list(rid, replicas)) then + (replicas and not find_in_list(rid, replicas)) then -- luacheck: ignore -- pass this tuple else cb(record) @@ -874,7 +872,7 @@ local function cat() local cat_format = opts.format local format_cb = cat_formats[cat_format] local is_printed = false - for id, file in ipairs(positional_arguments) do + for _, file in ipairs(positional_arguments) do log.error("Processing file '%s'", file) local gen, param, state = xlog.pairs(file) filter_xlog(gen, param, state, opts, function(record) @@ -900,7 +898,7 @@ local function play() if not remote:wait_connected() then error(("Error while connecting to host '%s'"):format(uri)) end - for id, file in ipairs(positional_arguments) do + for _, file in ipairs(positional_arguments) do log.info(("Processing file '%s'"):format(file)) local gen, param, state = xlog.pairs(file) filter_xlog(gen, param, state, opts, function(record) @@ -921,22 +919,13 @@ local function play() remote:close() end -local function find_arg(name_arg) - for i, key in ipairs(arg) do - if key:find(name_arg) ~= nil then - return key - end - end - return nil -end - local function rocks() local cfg = require("luarocks.core.cfg") cfg.init() local util = require("luarocks.util") local command_line = require("luarocks.cmd") -- Tweak help messages - util.see_help = function(command, program) + util.see_help = function() -- TODO: print extended help message here return "See Tarantool documentation for help." end @@ -1215,7 +1204,7 @@ local function usage_command(name, cmd) if type(header) == 'string' then header = { header } end - for no, line in ipairs(header) do + for _, line in ipairs(header) do log.error(" " .. line, name) end end -- 2.23.0