Remove `PLUGIN` from component class log level environment variables

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 <eeppeliteloop@gmail.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/cli/babeltrace.c b/cli/babeltrace.c
index d70e4b9ebca06c6468cdc1d6e15c38d021d659f5..56e32714710c68e524e855d5dcb56349c93bda85 100644 (file)
--- 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 bd015289d9c7e68ed59e24c32beab8334fbe472f..689bf9df20ae8b34ff7c14e854b883af34a0ddb8 100644 (file)
--- a/plugins/ctf/fs-sink/logging.c
+++ b/plugins/ctf/fs-sink/logging.c
@@ -24,4 +24,4 @@
 #include <babeltrace/logging-internal.h>
 
 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 c03b9845311bcc7dea7363aced975e431ba6c09e..13f0552699736940eab6a7cc8037b9a86edd4c33 100644 (file)
--- 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 <babeltrace/logging-internal.h>
 
-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 e6f3c0c905175eabc33854e593c57d5096c646e7..982b5b9eb28dabb357803ab24e5fc8a878b7026e 100644 (file)
--- 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 <babeltrace/logging-internal.h>
 
-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 3b57447f12d0d18ab72cb133a3cc9269fba30d22..78c2e17fd5491fa30c395048dc9c3341a6216a04 100644 (file)
--- a/plugins/lttng-utils/logging.c
+++ b/plugins/lttng-utils/logging.c
@@ -24,4 +24,4 @@
 #include <babeltrace/logging-internal.h>
 
 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 dc72a89e3db98c249c4ffb3241779ba450aef42f..5f0a552d0f320411a3e5fc589a173f0e05adf838 100644 (file)
--- a/plugins/text/dmesg/logging.c
+++ b/plugins/text/dmesg/logging.c
@@ -24,4 +24,4 @@
 #include <babeltrace/logging-internal.h>
 
 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 814143fb1d499afd8c80aa23b68ce42865476efc..04f797d1fa9d6074bbce41333256a0dbbbf55932 100644 (file)
--- a/plugins/utils/muxer/logging.c
+++ b/plugins/utils/muxer/logging.c
@@ -24,4 +24,4 @@
 #include <babeltrace/logging-internal.h>
 
 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 fffefdaccbbee3b976e8c566fc0ba5b38ca67aa4..f4d4cd5af559b1dce63ed608ddc867ea092f844e 100644 (file)
--- a/plugins/utils/trimmer/logging.c
+++ b/plugins/utils/trimmer/logging.c
@@ -24,4 +24,4 @@
 #include <babeltrace/logging-internal.h>
 
 BT_LOG_INIT_LOG_LEVEL(bt_plugin_utils_trimmer_log_level,
-       "BABELTRACE_PLUGIN_UTILS_TRIMMER_FLT_LOG_LEVEL");
+       "BABELTRACE_FLT_UTILS_TRIMMER_LOG_LEVEL");