From 2fad3ae7073bb826bbd7250b281821d3f87b8eb7 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Thu, 5 Oct 2017 14:05:42 -0400 Subject: [PATCH] Remove `PLUGIN` from component class log level environment variables MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit For example, `BABELTRACE_PLUGIN_CTF_FS_SRC_LOG_LEVEL` becomes `BABELTRACE_SRC_CTF_FS_LOG_LEVEL`. This is in line with the way we specify the component classes in the CLI and documentation, for example `src.ctf.fs`. The log level environment variables common to a whole plugin are still prefixed with `PLUGIN`, for example `BABELTRACE_PLUGIN_CTF_METADATA_LOG_LEVEL`. Signed-off-by: Philippe Proulx Signed-off-by: Jérémie Galarneau --- cli/babeltrace.c | 16 ++++++++-------- plugins/ctf/fs-sink/logging.c | 2 +- plugins/ctf/fs-src/logging.c | 2 +- plugins/ctf/lttng-live/logging.c | 2 +- plugins/lttng-utils/logging.c | 2 +- plugins/text/dmesg/logging.c | 2 +- plugins/utils/muxer/logging.c | 2 +- plugins/utils/trimmer/logging.c | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cli/babeltrace.c b/cli/babeltrace.c index d70e4b9e..56e32714 100644 --- a/cli/babeltrace.c +++ b/cli/babeltrace.c @@ -57,17 +57,17 @@ static const char* log_level_env_var_names[] = { "BABELTRACE_COMMON_LOG_LEVEL", "BABELTRACE_COMPAT_LOG_LEVEL", "BABELTRACE_PLUGIN_CTF_BTR_LOG_LEVEL", - "BABELTRACE_PLUGIN_CTF_FS_SINK_LOG_LEVEL", - "BABELTRACE_PLUGIN_CTF_FS_SRC_LOG_LEVEL", - "BABELTRACE_PLUGIN_CTF_LTTNG_LIVE_SRC_LOG_LEVEL", + "BABELTRACE_SINK_CTF_FS_LOG_LEVEL", + "BABELTRACE_SRC_CTF_FS_LOG_LEVEL", + "BABELTRACE_SRC_CTF_LTTNG_LIVE_LOG_LEVEL", "BABELTRACE_PLUGIN_CTF_METADATA_LOG_LEVEL", "BABELTRACE_PLUGIN_CTF_NOTIF_ITER_LOG_LEVEL", "BABELTRACE_PLUGIN_CTFCOPYTRACE_LIB_LOG_LEVEL", - "BABELTRACE_PLUGIN_LTTNG_UTILS_DEBUG_INFO_FLT_LOG_LEVEL", - "BABELTRACE_PLUGIN_TEXT_DMESG_SRC_LOG_LEVEL", - "BABELTRACE_PLUGIN_TEXT_PRETTY_SINK_LOG_LEVEL", - "BABELTRACE_PLUGIN_UTILS_MUXER_FLT_LOG_LEVEL", - "BABELTRACE_PLUGIN_UTILS_TRIMMER_FLT_LOG_LEVEL", + "BABELTRACE_FLT_LTTNG_UTILS_DEBUG_INFO_LOG_LEVEL", + "BABELTRACE_SRC_TEXT_DMESG_LOG_LEVEL", + "BABELTRACE_SINK_TEXT_PRETTY_LOG_LEVEL", + "BABELTRACE_FLT_UTILS_MUXER_LOG_LEVEL", + "BABELTRACE_FLT_UTILS_TRIMMER_LOG_LEVEL", "BABELTRACE_PYTHON_BT2_LOG_LEVEL", "BABELTRACE_PYTHON_PLUGIN_PROVIDER_LOG_LEVEL", NULL, diff --git a/plugins/ctf/fs-sink/logging.c b/plugins/ctf/fs-sink/logging.c index bd015289..689bf9df 100644 --- a/plugins/ctf/fs-sink/logging.c +++ b/plugins/ctf/fs-sink/logging.c @@ -24,4 +24,4 @@ #include BT_LOG_INIT_LOG_LEVEL(bt_plugin_fs_sink_log_level, - "BABELTRACE_PLUGIN_CTF_FS_SINK_LOG_LEVEL"); + "BABELTRACE_SINK_CTF_FS_LOG_LEVEL"); diff --git a/plugins/ctf/fs-src/logging.c b/plugins/ctf/fs-src/logging.c index c03b9845..13f05526 100644 --- a/plugins/ctf/fs-src/logging.c +++ b/plugins/ctf/fs-src/logging.c @@ -23,4 +23,4 @@ #define BT_LOG_OUTPUT_LEVEL ctf_fs_src_log_level #include -BT_LOG_INIT_LOG_LEVEL(BT_LOG_OUTPUT_LEVEL, "BABELTRACE_PLUGIN_CTF_FS_SRC_LOG_LEVEL"); +BT_LOG_INIT_LOG_LEVEL(BT_LOG_OUTPUT_LEVEL, "BABELTRACE_SRC_CTF_FS_LOG_LEVEL"); diff --git a/plugins/ctf/lttng-live/logging.c b/plugins/ctf/lttng-live/logging.c index e6f3c0c9..982b5b9e 100644 --- a/plugins/ctf/lttng-live/logging.c +++ b/plugins/ctf/lttng-live/logging.c @@ -23,4 +23,4 @@ #define BT_LOG_OUTPUT_LEVEL lttng_live_log_level #include -BT_LOG_INIT_LOG_LEVEL(lttng_live_log_level, "BABELTRACE_PLUGIN_CTF_LTTNG_LIVE_SRC_LOG_LEVEL"); +BT_LOG_INIT_LOG_LEVEL(lttng_live_log_level, "BABELTRACE_SRC_CTF_LTTNG_LIVE_LOG_LEVEL"); diff --git a/plugins/lttng-utils/logging.c b/plugins/lttng-utils/logging.c index 3b57447f..78c2e17f 100644 --- a/plugins/lttng-utils/logging.c +++ b/plugins/lttng-utils/logging.c @@ -24,4 +24,4 @@ #include BT_LOG_INIT_LOG_LEVEL(bt_plugin_lttng_utils_debug_info_log_level, - "BABELTRACE_PLUGIN_LTTNG_UTILS_DEBUG_INFO_FLT_LOG_LEVEL"); + "BABELTRACE_FLT_LTTNG_UTILS_DEBUG_INFO_LOG_LEVEL"); diff --git a/plugins/text/dmesg/logging.c b/plugins/text/dmesg/logging.c index dc72a89e..5f0a552d 100644 --- a/plugins/text/dmesg/logging.c +++ b/plugins/text/dmesg/logging.c @@ -24,4 +24,4 @@ #include BT_LOG_INIT_LOG_LEVEL(bt_plugin_text_dmesg_log_level, - "BABELTRACE_PLUGIN_TEXT_DMESG_SRC_LOG_LEVEL"); + "BABELTRACE_SRC_TEXT_DMESG_LOG_LEVEL"); diff --git a/plugins/utils/muxer/logging.c b/plugins/utils/muxer/logging.c index 814143fb..04f797d1 100644 --- a/plugins/utils/muxer/logging.c +++ b/plugins/utils/muxer/logging.c @@ -24,4 +24,4 @@ #include BT_LOG_INIT_LOG_LEVEL(bt_plugin_utils_muxer_log_level, - "BABELTRACE_PLUGIN_UTILS_MUXER_FLT_LOG_LEVEL"); + "BABELTRACE_FLT_UTILS_MUXER_LOG_LEVEL"); diff --git a/plugins/utils/trimmer/logging.c b/plugins/utils/trimmer/logging.c index fffefdac..f4d4cd5a 100644 --- a/plugins/utils/trimmer/logging.c +++ b/plugins/utils/trimmer/logging.c @@ -24,4 +24,4 @@ #include BT_LOG_INIT_LOG_LEVEL(bt_plugin_utils_trimmer_log_level, - "BABELTRACE_PLUGIN_UTILS_TRIMMER_FLT_LOG_LEVEL"); + "BABELTRACE_FLT_UTILS_TRIMMER_LOG_LEVEL"); -- 2.34.1