From: Sergey Bronnikov <estetus@gmail.com>
To: tarantool-patches@dev.tarantool.org
Cc: o.piskunov@tarantool.org
Subject: [Tarantool-patches] [PATCH v2 4/6] Fix luacheck warnings in extra/dist/tarantoolctl.in
Date: Wed, 8 Apr 2020 18:43:03 +0300 [thread overview]
Message-ID: <10d6c48a3f320e81b8bd8b05de385f20cbfead9c.1586341316.git.sergeyb@tarantool.org> (raw)
In-Reply-To: <cover.1586341316.git.sergeyb@tarantool.org>
From: Sergey Bronnikov <sergeyb@tarantool.org>
Closes #4681
---
| 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
--git a/extra/dist/tarantoolctl.in b/extra/dist/tarantoolctl.in
index f5a912ccd..3bcbe5b79 100755
--- a/extra/dist/tarantoolctl.in
+++ b/extra/dist/tarantoolctl.in
@@ -46,7 +46,6 @@ local instance_dir
local default_cfg
local positional_arguments
local keyword_arguments
-local lua_arguments = arg
local language
-- function for printing usage reference
@@ -64,7 +63,7 @@ end
local function check_user_level()
local uid = os.getenv('UID')
- local udir = nil
+ local udir
if uid == 0 or os.getenv("NOTIFY_SOCKET") then
return nil
end
@@ -420,7 +419,7 @@ local cat_formats = setmetatable({
json = cat_json_cb,
lua = cat_lua_cb,
}, {
- __index = function(self, cmd)
+ __index = function(cmd)
error(("Unknown formatter '%s'"):format(cmd))
end
})
@@ -790,7 +789,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:")
@@ -848,7 +847,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
@@ -875,7 +873,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)
@@ -901,7 +899,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)
@@ -923,7 +921,7 @@ local function play()
end
local function find_arg(name_arg)
- for i, key in ipairs(arg) do
+ for _, key in ipairs(arg) do
if key:find(name_arg) ~= nil then
return key
end
@@ -937,7 +935,7 @@ local function rocks()
local util = require("luarocks.util")
local command_line = require("luarocks.cmd")
local options = keyword_arguments
- local key = nil
+ local key
if options["only-server"] ~= nil then
key = find_arg("only%-server")
else
@@ -954,7 +952,7 @@ local function rocks()
end
-- 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
@@ -1321,7 +1319,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-04-08 15:43 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-08 15:42 [Tarantool-patches] [PATCH v2 0/6] Add static analysis with luacheck Sergey Bronnikov
2020-04-08 15:43 ` [Tarantool-patches] [PATCH v2 1/6] Fix luacheck warnings in src/lua/ Sergey Bronnikov
2020-04-09 4:31 ` Alexander Tikhonov
2020-04-11 16:54 ` Vladislav Shpilevoy
2020-04-08 15:43 ` [Tarantool-patches] [PATCH v2 2/6] Fix luacheck warnings in test/ Sergey Bronnikov
2020-04-09 4:31 ` Alexander Tikhonov
2020-04-11 16:54 ` Vladislav Shpilevoy
2020-04-14 7:49 ` Sergey Bronnikov
2020-04-11 16:54 ` Vladislav Shpilevoy
2020-04-08 15:43 ` [Tarantool-patches] [PATCH v2 3/6] Fix luacheck warnings in src/box/lua/ Sergey Bronnikov
2020-04-09 4:29 ` Alexander Tikhonov
2020-04-08 15:43 ` Sergey Bronnikov [this message]
2020-04-09 4:29 ` [Tarantool-patches] [PATCH v2 4/6] Fix luacheck warnings in extra/dist/tarantoolctl.in Alexander Tikhonov
2020-04-09 7:30 ` Oleg Babin
2020-04-10 14:05 ` Sergey Bronnikov
2020-04-15 15:14 ` Igor Munkin
2020-04-15 15:37 ` Igor Munkin
2020-04-08 15:43 ` [Tarantool-patches] [PATCH v2 5/6] Add luacheck config Sergey Bronnikov
2020-04-09 4:27 ` Alexander Tikhonov
2020-04-11 16:54 ` Vladislav Shpilevoy
2020-04-13 15:16 ` Sergey Bronnikov
2020-04-14 23:29 ` Vladislav Shpilevoy
2020-04-15 8:30 ` Sergey Bronnikov
2020-04-08 15:43 ` [Tarantool-patches] [PATCH v2 6/6] gitlab-ci: enable static analysis with luacheck Sergey Bronnikov
2020-04-09 4:20 ` Alexander Tikhonov
2020-04-10 14:53 ` Sergey Bronnikov
2020-04-22 8:45 ` Alexander Tikhonov
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=10d6c48a3f320e81b8bd8b05de385f20cbfead9c.1586341316.git.sergeyb@tarantool.org \
--to=estetus@gmail.com \
--cc=o.piskunov@tarantool.org \
--cc=tarantool-patches@dev.tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH v2 4/6] 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