From: Serge Petrenko <sergepetrenko@tarantool.org>
To: tarantool-patches@freelists.org
Cc: Serge Petrenko <sergepetrenko@tarantool.org>
Subject: [tarantool-patches] [PATCH] Replace net.box usage with console in tarantoolctl eval
Date: Wed, 4 Jul 2018 12:59:02 +0300 [thread overview]
Message-ID: <20180704095902.58607-1-sergepetrenko@tarantool.org> (raw)
Net.box usage for console is deprecated in 1.10,
replaced it with console.
Closes: #3490
---
https://github.com/tarantool/tarantool/tree/sergepetrenko/gh-3490-tarantoolctl-replace-netbox
https://github.com/tarantool/tarantool/issues/3490
| 28 ++++++++++++++++++++++------
1 file changed, 22 insertions(+), 6 deletions(-)
--git a/extra/dist/tarantoolctl.in b/extra/dist/tarantoolctl.in
index 507ebe8bf..463d3e0a1 100755
--- a/extra/dist/tarantoolctl.in
+++ b/extra/dist/tarantoolctl.in
@@ -647,13 +647,29 @@ local function stdin_isatty()
end
local function execute_remote(uri, code)
- local remote = netbox.connect(uri, {
- console = true, connect_timeout = TIMEOUT_INFINITY
- })
- if remote == nil then
- return nil
+ local err, ret
+ console.on_start(function(self)
+ local cmd = string.format(
+ "require('console').connect('%s', { connect_timeout = %s })",
+ uri, TIMEOUT_INFINITY
+ )
+ err = self:eval(cmd)
+ err = yaml.decode(err)[1]
+ if type(err) == 'table' and err.error then
+ err = false
+ else
+ ret = self:eval(code)
+ end
+ self.running = false
+ end)
+ console.on_client_disconnect(function(self) self.running = false end)
+
+ console.start()
+
+ if not err then
+ return false
end
- return true, remote:eval(code)
+ return true, ret
end
local function connect()
--
2.15.2 (Apple Git-101.1)
next reply other threads:[~2018-07-04 9:59 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-04 9:59 Serge Petrenko [this message]
2018-07-05 11:29 ` [tarantool-patches] " Vladislav Shpilevoy
2018-07-06 13:02 ` Sergey Petrenko
2018-07-09 9:53 ` Vladislav Shpilevoy
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=20180704095902.58607-1-sergepetrenko@tarantool.org \
--to=sergepetrenko@tarantool.org \
--cc=tarantool-patches@freelists.org \
--subject='Re: [tarantool-patches] [PATCH] Replace net.box usage with console in tarantoolctl eval' \
/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