Tarantool development patches archive
 help / color / mirror / Atom feed
From: Cyrill Gorcunov <gorcunov@gmail.com>
To: tml <tarantool-patches@dev.tarantool.org>
Subject: [Tarantool-patches] [PATCH v3 03/10] core/say: do not reconfig early set up logger
Date: Wed, 27 May 2020 14:13:59 +0300	[thread overview]
Message-ID: <20200527111406.145422-4-gorcunov@gmail.com> (raw)
In-Reply-To: <20200527111406.145422-1-gorcunov@gmail.com>

We gonna support logger configuration on its own
without requirement to call `box.cfg{}`. Thus lets
say_logger_init() to skip processing if we already
did.

Note it is preparatory for next patches. Currently
the init called once.

Part-of #689

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
---
 src/lib/core/say.c | 13 +++++++++++++
 src/lib/core/say.h |  4 ++++
 2 files changed, 17 insertions(+)

diff --git a/src/lib/core/say.c b/src/lib/core/say.c
index e22089aac..d8f59fb9b 100644
--- a/src/lib/core/say.c
+++ b/src/lib/core/say.c
@@ -684,10 +684,23 @@ log_create(struct log *log, const char *init_str, int nonblock)
 	return 0;
 }
 
+bool
+say_logger_initialized(void)
+{
+	return log_default == &log_std;
+}
+
 void
 say_logger_init(const char *init_str, int level, int nonblock,
 		const char *format, int background)
 {
+	/*
+	 * The logger may be early configured
+	 * by hands without configuing the whole box.
+	 */
+	if (say_logger_initialized())
+		return;
+
 	if (log_create(&log_std, init_str, nonblock) < 0)
 		goto fail;
 
diff --git a/src/lib/core/say.h b/src/lib/core/say.h
index c50d7bbf4..857145465 100644
--- a/src/lib/core/say.h
+++ b/src/lib/core/say.h
@@ -274,6 +274,10 @@ say_logger_init(const char *init_str,
 		const char *log_format,
 		int background);
 
+/** Test if logger is initialized. */
+bool
+say_logger_initialized(void);
+
 /** Free default logger */
 void
 say_logger_free();
-- 
2.26.2

  parent reply	other threads:[~2020-05-27 11:14 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-27 11:13 [Tarantool-patches] [PATCH v3 00/10] lua/log: add an ability to setup logger without box.cfg{} Cyrill Gorcunov
2020-05-27 11:13 ` [Tarantool-patches] [PATCH v3 01/10] core/say: drop redundant declarations Cyrill Gorcunov
2020-05-28  7:21   ` Kirill Yukhin
2020-05-27 11:13 ` [Tarantool-patches] [PATCH v3 02/10] core/say: drop vsay declaration Cyrill Gorcunov
2020-05-28  7:21   ` Kirill Yukhin
2020-05-27 11:13 ` Cyrill Gorcunov [this message]
2020-05-27 11:14 ` [Tarantool-patches] [PATCH v3 04/10] lua/log: declare say_logger_init and say_logger_initialized Cyrill Gorcunov
2020-05-27 11:14 ` [Tarantool-patches] [PATCH v3 05/10] lua/log: put string constants to map Cyrill Gorcunov
2020-05-27 12:58   ` Oleg Babin
2020-05-27 11:14 ` [Tarantool-patches] [PATCH v3 06/10] lua/log: do not allow to set json for boot logger Cyrill Gorcunov
2020-05-27 11:14 ` [Tarantool-patches] [PATCH v3 07/10] lua/log: declare log as separate variable Cyrill Gorcunov
2020-05-27 12:58   ` Oleg Babin
2020-05-27 11:14 ` [Tarantool-patches] [PATCH v3 08/10] lua/log: use log module settings inside box.cfg Cyrill Gorcunov
2020-05-27 11:14 ` [Tarantool-patches] [PATCH v3 09/10] lua/log: allow to configure logging without a box Cyrill Gorcunov
2020-05-27 12:59   ` Oleg Babin
2020-05-27 11:14 ` [Tarantool-patches] [PATCH v3 10/10] test: use direct log module Cyrill Gorcunov
2020-05-27 12:59   ` Oleg Babin
2020-05-27 12:58 ` [Tarantool-patches] [PATCH v3 00/10] lua/log: add an ability to setup logger without box.cfg{} Oleg Babin

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=20200527111406.145422-4-gorcunov@gmail.com \
    --to=gorcunov@gmail.com \
    --cc=tarantool-patches@dev.tarantool.org \
    --subject='Re: [Tarantool-patches] [PATCH v3 03/10] core/say: do not reconfig early set up logger' \
    /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