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 6572226C12 for ; Thu, 5 Jul 2018 02:58:51 -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 HemwpAg7zaQl for ; Thu, 5 Jul 2018 02:58:51 -0400 (EDT) Received: from smtp62.i.mail.ru (smtp62.i.mail.ru [217.69.128.42]) (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 25FF926BF9 for ; Thu, 5 Jul 2018 02:58:50 -0400 (EDT) Subject: [tarantool-patches] Re: [PATCHv2] Detect when instance is run or restarted by tarantoolctl. References: <20180702144822.4860-1-sergepetrenko@tarantool.org> <20180704180452.GA20825@chai> From: Sergey Petrenko Message-ID: <89167066-9666-12e1-2973-b8f1ad81331d@tarantool.org> Date: Thu, 5 Jul 2018 09:58:47 +0300 MIME-Version: 1.0 In-Reply-To: <20180704180452.GA20825@chai> Content-Type: text/plain; charset="utf-8"; format="flowed" Content-Transfer-Encoding: 8bit Content-Language: ru 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: Konstantin Osipov , tarantool-patches@freelists.org 04.07.2018 21:04, Konstantin Osipov пишет: > * Serge Petrenko [18/07/02 17:54]: >> There are some hacks to know the instance was run by tarantoolctl, >> none of them are too reliable, though. This patch introduces 2 >> environment variables set by tarantoolctl for the instance to >> know when it's being run or restarted. >> >> Closes: #3215 > Hi, > > Please add a petition to docbot to the commit message. Hi, thank you for review. Petition added: There are some hacks to know the instance was run by tarantoolctl, none of them are too reliable, though. This patch introduces 2 environment variables set by tarantoolctl for the instance to know when it's being run or restarted. Closes: #3215 @TarantoolBot document Title: tarantoolctl: document setting environment variables tarantoolctl sets the `TARANTOOLCTL` environment variable when starting an instance, and sets the `TARANTOOL_RESTARTED' environment variable when restarting. ---  extra/dist/tarantoolctl.in | 8 ++++++++  1 file changed, 8 insertions(+) diff --git a/extra/dist/tarantoolctl.in b/extra/dist/tarantoolctl.in index b6b8e09c9..ecab0a0f1 100755 --- a/extra/dist/tarantoolctl.in +++ b/extra/dist/tarantoolctl.in @@ -514,6 +514,11 @@ local function start()          script_name = instance_path,          __defer_update = true      } + +    -- an env variable to tell when we the +    -- instance is run under tarantoolctl +    os.setenv('TARANTOOLCTL', 'true') +      shift_argv(arg, 0, 2)      local success, data = pcall(dofile, instance_path)      -- if load fails - show last 10 lines of the log file and exit @@ -593,6 +598,9 @@ local function restart()      end      stop()      fiber.sleep(1) +    -- an env variable to tell when +    -- the instance was restarted +    os.setenv('TARANTOOL_RESTARTED', 'true')      start()      return 0  end > > Re TARANTOOL_RESTARTED, let's discuss this - I don't think > this is going to address > https://github.com/tarantool/tarantool/issues/3384 > and gh-3215 is not asking for it. > > So for now I would remove it from the patch. > I believe you asked for it in the comments, if I understood correctly: https://github.com/tarantool/tarantool/issues/3215#issuecomment-388223021