From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtpng1.m.smailru.net (smtpng1.m.smailru.net [94.100.181.251]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 627DE469719 for ; Wed, 4 Mar 2020 16:51:35 +0300 (MSK) Date: Wed, 4 Mar 2020 16:51:33 +0300 From: Alexander Turenko Message-ID: <20200304135133.hnj3wdsnizsbo76l@tkn_work_nb> References: <20200218180101.37385-1-arkholga@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20200218180101.37385-1-arkholga@tarantool.org> Subject: Re: [Tarantool-patches] [PATCH] test_run: add path option to grep_log List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Olga Arkhangelskaia Cc: tarantool-patches@dev.tarantool.org The patch looks okay, but I would ask you to do few small modifications (see below). WBR, Alexander Turenko. On Tue, Feb 18, 2020 at 09:01:01PM +0300, Olga Arkhangelskaia wrote: > While using grep_log it is useful to have a possibility to go through crashed Please, keep a commit message body within 72 symbols. See https://www.tarantool.io/en/doc/1.10/dev_guide/developer_guidelines/#how-to-write-a-commit-message > instance log. > Usage in case of crashed instance: > test_run:grep_log(nil, str-to-find, nil, {path=path_to_log}) > > Closes #196 > --- > Issue:https://github.com/tarantool/test-run/issues/196 > Branch:https://github.com/tarantool/test-run/pull/new/OKriw/gh-196-Extend-grep_log-for-crashed-instances > > test_run.lua | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/test_run.lua b/test_run.lua > index 4d8132d..68dba53 100644 > --- a/test_run.lua > +++ b/test_run.lua > @@ -326,7 +326,9 @@ end > local function grep_log(self, node, what, bytes, opts) > local opts = opts or {} > local noreset = opts.noreset or false > - local filename = self:eval(node, "box.cfg.log")[1] > + -- node is used in case of alive instance, otherwise path to log can be > + -- used for path > + local filename = opts.path or self:eval(node, "box.cfg.log")[1] Nit: It is rule of thumb to fit comments within 66 symbols. We already use 'filename' name for this, I would use it for the option too. I suggest the following pattern for options: | local function f(<...>, opts) | local opts = opts or {} | local foo = opts.foo (or if it is not nil) | local bar = opts.bar | <...the rest code...> | end This way it is easy to find them all in code at one glance. > local file = fio.open(filename, {'O_RDONLY', 'O_NONBLOCK'}) > > local function fail(msg) > -- > 2.20.1 (Apple Git-117) >