From: sergeyb@tarantool.org
To: tarantool-patches@dev.tarantool.org
Cc: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>,
o.piskunov@tarantool.org
Subject: [Tarantool-patches] [PATCH v5 03/10] Fix luacheck warnings in extra/dist/tarantoolctl.in
Date: Tue, 12 May 2020 12:49:57 +0300 [thread overview]
Message-ID: <bd4dad3bf3b9a1266808a32b0a23995eac273e62.1589275364.git.sergeyb@tarantool.org> (raw)
In-Reply-To: <cover.1589275364.git.sergeyb@tarantool.org>
From: Sergey Bronnikov <sergeyb@tarantool.org>
Closes #4681
Reviewed-by: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
Reviewed-by: Igor Munkin <imun@tarantool.org>
Co-authored-by: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
Co-authored-by: Igor Munkin <imun@tarantool.org>
---
.luacheckrc | 5 +++++
| 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"}
+}
--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
next prev parent reply other threads:[~2020-05-12 9:52 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-12 9:49 [Tarantool-patches] [PATCH v5 00/10] Add static analysis with luacheck sergeyb
2020-05-12 9:49 ` [Tarantool-patches] [PATCH v5 01/10] Add initial luacheck config sergeyb
2020-05-26 22:15 ` Igor Munkin
2020-05-28 15:31 ` Sergey Bronnikov
2020-05-28 16:07 ` Sergey Bronnikov
2020-05-29 11:20 ` Igor Munkin
2020-11-10 14:30 ` Sergey Bronnikov
2020-11-10 14:49 ` Igor Munkin
2020-05-12 9:49 ` [Tarantool-patches] [PATCH v5 02/10] gitlab-ci: enable static analysis with luacheck sergeyb
2020-05-13 14:15 ` Alexander V. Tikhonov
2020-05-13 14:40 ` Sergey Bronnikov
2020-05-26 22:39 ` Igor Munkin
2020-05-28 10:03 ` Sergey Bronnikov
2020-05-12 9:49 ` sergeyb [this message]
2020-05-26 23:11 ` [Tarantool-patches] [PATCH v5 03/10] Fix luacheck warnings in extra/dist/tarantoolctl.in Igor Munkin
2020-05-28 10:13 ` Sergey Bronnikov
2020-05-12 9:49 ` [Tarantool-patches] [PATCH v5 04/10] Fix luacheck warnings in src/lua/ sergeyb
2020-05-27 11:22 ` Igor Munkin
2020-05-28 12:22 ` Sergey Bronnikov
2020-05-12 9:50 ` [Tarantool-patches] [PATCH v5 05/10] " sergeyb
2020-05-13 11:13 ` Sergey Bronnikov
2020-05-27 11:22 ` Igor Munkin
2020-05-12 9:50 ` [Tarantool-patches] [PATCH v5 06/10] Fix luacheck warnings in src/box/lua/ sergeyb
2020-05-27 16:54 ` Igor Munkin
2020-05-28 15:16 ` Sergey Bronnikov
2020-05-12 9:50 ` [Tarantool-patches] [PATCH v5 07/10] " sergeyb
2020-05-13 11:14 ` Sergey Bronnikov
2020-05-27 16:54 ` Igor Munkin
2020-05-28 11:19 ` Sergey Bronnikov
2020-05-12 9:50 ` [Tarantool-patches] [PATCH v5 08/10] Fix luacheck warnings in test/ sergeyb
2020-05-29 11:08 ` Igor Munkin
2020-05-29 14:08 ` Sergey Bronnikov
2020-05-12 9:50 ` [Tarantool-patches] [PATCH v5 09/10] Add luacheck supressions for luajit tests sergeyb
2020-05-26 20:45 ` Igor Munkin
2020-05-28 19:25 ` Sergey Bronnikov
2020-05-12 12:28 ` [Tarantool-patches] [PATCH 10/10] build: Enable 'make luacheck' target Sergey Bronnikov
2020-05-26 20:45 ` Igor Munkin
2020-05-28 9:59 ` Sergey Bronnikov
2020-05-26 20:38 ` [Tarantool-patches] [PATCH v5 11/10] test: fix warnings spotted by luacheck sergeyb
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=bd4dad3bf3b9a1266808a32b0a23995eac273e62.1589275364.git.sergeyb@tarantool.org \
--to=sergeyb@tarantool.org \
--cc=o.piskunov@tarantool.org \
--cc=tarantool-patches@dev.tarantool.org \
--cc=v.shpilevoy@tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH v5 03/10] Fix luacheck warnings in extra/dist/tarantoolctl.in' \
/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