From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id 256961FAB6 for ; Tue, 5 Mar 2019 08:43:07 -0500 (EST) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id i4PINi8cStdF for ; Tue, 5 Mar 2019 08:43:07 -0500 (EST) Received: from smtpng3.m.smailru.net (smtpng3.m.smailru.net [94.100.177.149]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id 5F5DF1F9F0 for ; Tue, 5 Mar 2019 08:43:06 -0500 (EST) Date: Tue, 5 Mar 2019 16:43:04 +0300 From: Alexander Turenko Subject: [tarantool-patches] Re: [PATCH v1 1/1] box: fix custom delimiter for telnet connection Message-ID: <20190305134303.ndcovkmiritgpdwp@tkn_work_nb> References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-Help: List-Unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-Subscribe: List-Owner: List-post: List-Archive: To: Kirill Shcherbatov Cc: tarantool-patches@freelists.org This patch looks good for me, except several minor things. Can we write a test for the new behaviour? WBR, Alexander Turenko. On Thu, Feb 21, 2019 at 10:34:55AM +0300, Kirill Shcherbatov wrote: > Because test-run uses a console connection to run tests, the > actual string delimiter was the user-specified delimiter > delim + "\n". 'test-run uses a console connection' says nothing about why a newline is added to a delimiter. I would say: In order to give a user ability to use a delimiter symbol within a code the real delimiter is user-provided 'delim' plus '\n'. > Since telnet sends \r\n on line break, the updated expression > delim + "\n"could not be found in a sequence data+delim+"\r\n", Forgotten whitespace after the first "\n". > so delimiter feature did not work at all. > Added delim + "\r" check along with delim + "\n", that solves the > described problem and does not violate backward compatibility. > > Closes #2027 > > https://github.com/tarantool/tarantool/tree/kshch/gh-2027-telnet-alternative-delimiter > https://github.com/tarantool/tarantool/issues/2027 > --- > src/box/lua/console.lua | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/src/box/lua/console.lua b/src/box/lua/console.lua > index 028001127..bdedcb393 100644 > --- a/src/box/lua/console.lua > +++ b/src/box/lua/console.lua > @@ -344,8 +344,9 @@ end > -- Read command from connected client console.listen() > -- > local function client_read(self) > - local delim = self.delimiter .. "\n" > - local buf = self.client:read(delim) > + local delim_lf = self.delimiter .. "\n" > + local delim_cr = self.delimiter .. "\r" I would comment here why we need delim_cr (in short). > + local buf = self.client:read({delimiter = {delim_lf, delim_cr}}) > if buf == nil then > return nil > elseif buf == "" then > @@ -355,7 +356,7 @@ local function client_read(self) > return nil > end > -- remove trailing delimiter > - return buf:sub(1, -#delim-1) > + return buf:sub(1, -#delim_lf-1) I would use `-#self.delimiter` to make the code simmetric btw delim_cr / delim_lf. > end > > -- > -- > 2.20.1 >