From: Philippe Proulx Date: Wed, 19 Jun 2019 07:03:38 +0000 (-0400) Subject: lib: use `LIBBABELTRACE2_INIT_LOG_LEVEL` env. var. to initialize log level X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=b0f769e2a5c13388687a90904ea3f868a56bdc73 lib: use `LIBBABELTRACE2_INIT_LOG_LEVEL` env. var. to initialize log level Use the `LIBBABELTRACE2_INIT_LOG_LEVEL` environment variable instead of `BABELTRACE_LOGGING_GLOBAL_LEVEL` to make it very clear that it's about the library, and not related to the individual component log levels, for example. `INIT` is in the name to indicate that it's only the initial log level; the library user can still change it at run time with bt_logging_set_global_level(), while the other log level environment variables, `BABELTRACE_PLUGIN_CTF_METADATA_LOG_LEVEL` and `BABELTRACE_PYTHON_BT2_LOG_LEVEL`, are used to set the definitive log levels of those modules. Signed-off-by: Philippe Proulx Change-Id: Ibf580bed6c30d88b4fbe3aed20f38cc969bc9295 Reviewed-on: https://review.lttng.org/c/babeltrace/+/1511 Reviewed-by: Francis Deslauriers --- diff --git a/src/cli/babeltrace2.c b/src/cli/babeltrace2.c index e38eac70..c8c8e821 100644 --- a/src/cli/babeltrace2.c +++ b/src/cli/babeltrace2.c @@ -2755,7 +2755,7 @@ void set_auto_log_levels(struct bt_config *cfg) * is less verbose than VERBOSE in the internal * logging framework) */ - if (!getenv("BABELTRACE_LOGGING_GLOBAL_LEVEL")) { + if (!getenv("LIBBABELTRACE2_INIT_LOG_LEVEL")) { if (cfg->verbose) { bt_logging_set_global_level(BT_LOG_INFO); } else if (cfg->debug) { diff --git a/src/lib/logging.c b/src/lib/logging.c index 8c36f5ab..fa782b44 100644 --- a/src/lib/logging.c +++ b/src/lib/logging.c @@ -38,7 +38,7 @@ * In non-developer mode, use NONE by default: we don't print logging * statements for any executable which links with the library. The * executable must call bt_logging_set_global_level() or the - * executable's user must set the BABELTRACE_LOGGING_GLOBAL_LEVEL + * executable's user must set the `LIBBABELTRACE2_INIT_LOG_LEVEL` * environment variable to enable logging. */ # define DEFAULT_LOG_LEVEL BT_LOG_NONE @@ -79,7 +79,7 @@ void __attribute__((constructor)) bt_logging_ctor(void) ""; bt_logging_set_global_level( - bt_log_get_level_from_env("BABELTRACE_LOGGING_GLOBAL_LEVEL")); + bt_log_get_level_from_env("LIBBABELTRACE2_INIT_LOG_LEVEL")); BT_LOGI("Babeltrace %d.%d.%d%s library loaded: " "major=%d, minor=%d, patch=%d, extra=\"%s\"", bt_version_get_major(), bt_version_get_minor(),