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 239302887F for ; Fri, 30 Aug 2019 17:49:13 -0400 (EDT) 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 VJ0173wjunV6 for ; Fri, 30 Aug 2019 17:49:13 -0400 (EDT) Received: from mail-lj1-f194.google.com (mail-lj1-f194.google.com [209.85.208.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id B49AB2887B for ; Fri, 30 Aug 2019 17:49:12 -0400 (EDT) Received: by mail-lj1-f194.google.com with SMTP id f9so7694463ljc.13 for ; Fri, 30 Aug 2019 14:49:12 -0700 (PDT) From: Cyrill Gorcunov Subject: [tarantool-patches] [PATCH 5/5] box/console: Provide console.eos() api Date: Sat, 31 Aug 2019 00:48:08 +0300 Message-Id: <20190830214808.17422-6-gorcunov@gmail.com> In-Reply-To: <20190830214808.17422-1-gorcunov@gmail.com> References: <20190830214808.17422-1-gorcunov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: tml Cc: Alexander Turenko , Konstantin Osipov , Kirill Yukhin , Cyrill Gorcunov The other modules would be able to find out which eos marker is currently active. For example when reading replies from remote server via text based console protocol. @TarantoolBot document Title: > require('console').eos() Returns a string with currently active end of string marker. @TarantoolBot document Title: > require('console').eos("") Sets end of string marker for appliable output modes. YAML output mode does not support eos change. For Lua mode it is possible to set eos to empty string (like in example above) or any other symbol. Note that default semicolon symbol is mandatory for remote text consoles thus if get zapped the read procedure from remote socket will not be possible and connection get stuck forever. Use this ability with extreme caution. Part-of #3834 --- src/box/lua/console.lua | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/box/lua/console.lua b/src/box/lua/console.lua index 203dc668c..67238283b 100644 --- a/src/box/lua/console.lua +++ b/src/box/lua/console.lua @@ -163,6 +163,21 @@ local function current_eos() return output_eos[d["fmt"]] end +local function console_eos(...) + if not ... then + return tostring(current_eos()) + end + -- We can't allow to change yaml eos format because + -- it is a part of encoding standart, thus permit + -- only for modes where it is safe. + local d = current_output() + if d["fmt"] == "lua" then + output_eos["lua"] = ... + else + error("console.eos(): is immutable for output " .. d["fmt"]) + end +end + -- -- Map output format into a "\set" command. local function output_cmd_string() @@ -780,6 +795,7 @@ package.loaded['console'] = { delimiter = delimiter; set_default_output = set_default_output; get_default_output = get_default_output; + eos = console_eos; ac = ac; connect = connect; listen = listen; -- 2.20.1