Tarantool development patches archive
 help / color / mirror / Atom feed
From: Alexander Turenko <alexander.turenko@tarantool.org>
To: Vladislav Shpilevoy <v.shpilevoy@tarantool.org>
Cc: tarantool-patches@freelists.org, tarantool-patches@dev.tarantool.org
Subject: Re: [Tarantool-patches] [PATCH 1/1] console: fix usage of an undeclared variable
Date: Fri, 18 Oct 2019 00:06:27 +0300	[thread overview]
Message-ID: <20191017210627.g2quduhuph243u4q@tkn_work_nb> (raw)
In-Reply-To: <6de1f18613e9b6a3f716c60b9c85457d2bd9eb64.1571341771.git.v.shpilevoy@tarantool.org>

LGTM.

Pushed to master, 2.2, 2.1 and 1.10.

WBR, Alexander Turenko.

On Thu, Oct 17, 2019 at 09:50:44PM +0200, Vladislav Shpilevoy wrote:
> Console client's eval() method in case of an error at
> reading from a socket was trying to return a variable
> declared in a different view scope. Instead, the
> error should be raised to drop the connection.
> ---
> Branch: https://github.com/tarantool/tarantool/tree/gerold103/console-undefined-variable
> 
> No test, because can be reproduced only in repl mode of a client.
> 
>  src/box/lua/console.lua | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/box/lua/console.lua b/src/box/lua/console.lua
> index f70ed830a..52df67465 100644
> --- a/src/box/lua/console.lua
> +++ b/src/box/lua/console.lua
> @@ -451,7 +451,7 @@ local text_connection_mt = {
>                      self.print_f(rc)
>                  end
>              end
> -            return rc
> +            return error(self:set_error())
>          end,
>          --
>          -- Make the connection be in error state, set error
> -- 
> 2.21.0 (Apple Git-122)
> 

      parent reply	other threads:[~2019-10-17 21:06 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-17 19:50 Vladislav Shpilevoy
2019-10-17 20:00 ` Cyrill Gorcunov
2019-10-17 20:31   ` [Tarantool-patches] [tarantool-patches] " Vladislav Shpilevoy
2019-10-17 21:05     ` Cyrill Gorcunov
2019-10-17 21:08       ` Cyrill Gorcunov
2019-10-17 21:18         ` Vladislav Shpilevoy
2019-10-17 21:15           ` Cyrill Gorcunov
2019-10-17 21:22             ` Vladislav Shpilevoy
2019-10-17 21:19               ` Cyrill Gorcunov
2019-10-17 21:26                 ` Vladislav Shpilevoy
2019-10-17 21:31                   ` Cyrill Gorcunov
2019-10-17 21:06 ` Alexander Turenko [this message]

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=20191017210627.g2quduhuph243u4q@tkn_work_nb \
    --to=alexander.turenko@tarantool.org \
    --cc=tarantool-patches@dev.tarantool.org \
    --cc=tarantool-patches@freelists.org \
    --cc=v.shpilevoy@tarantool.org \
    --subject='Re: [Tarantool-patches] [PATCH 1/1] console: fix usage of an undeclared variable' \
    /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