Fix: bindings/python/bt2: use appropriate log level variable names

Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/bindings/python/bt2/bt2/logging.c b/bindings/python/bt2/bt2/logging.c
index 52d531c7df19b163565518ba529138e76156ca07..be64a86262fba3043cd6a81148012b3e4fd40e08 100644 (file)
--- a/bindings/python/bt2/bt2/logging.c
+++ b/bindings/python/bt2/bt2/logging.c
@@ -20,7 +20,8 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_OUTPUT_LEVEL bt_cli_log_level
+#define BT_LOG_OUTPUT_LEVEL bt_python_bindings_bt2_log_level
 #include <babeltrace/logging-internal.h>
 
-BT_LOG_INIT_LOG_LEVEL(bt_cli_log_level, "BABELTRACE_CLI_LOG_LEVEL");
+BT_LOG_INIT_LOG_LEVEL(bt_python_bindings_bt2_log_level,
+       "BABELTRACE_PYTHON_BT2_LOG_LEVEL");

diff --git a/bindings/python/bt2/bt2/logging.h b/bindings/python/bt2/bt2/logging.h
index ccc6c527e1b664ac64c52690217074c02cf204d7..fb0ef9f3a8d6fc8c802a21a07d1c5be2841faa02 100644 (file)
--- a/bindings/python/bt2/bt2/logging.h
+++ b/bindings/python/bt2/bt2/logging.h
@@ -1,5 +1,5 @@
-#ifndef CLI_LOGGING_H
-#define CLI_LOGGING_H
+#ifndef BABELTRACE_BINDINGS_PYTHON_BT2_LOGGING_H
+#define BABELTRACE_BINDINGS_PYTHON_BT2_LOGGING_H
 
 /*
  * Copyright (c) 2017 Philippe Proulx <pproulx@efficios.com>
@@ -23,9 +23,9 @@
  * SOFTWARE.
  */
 
-#define BT_LOG_OUTPUT_LEVEL bt_cli_log_level
+#define BT_LOG_OUTPUT_LEVEL bt_python_bindings_bt2_log_level
 #include <babeltrace/logging-internal.h>
 
-BT_LOG_LEVEL_EXTERN_SYMBOL(bt_cli_log_level);
+BT_LOG_LEVEL_EXTERN_SYMBOL(bt_python_bindings_bt2_log_level);
 
-#endif /* CLI_LOGGING_H */
+#endif /* BABELTRACE_BINDINGS_PYTHON_BT2_LOGGING_H */

diff --git a/cli/babeltrace.c b/cli/babeltrace.c
index 95b89c81d85b44a02ba49c42da0521514ec72535..15db3eafcc8edcadca0e6cd2220d81dc8e41c09f 100644 (file)
--- a/cli/babeltrace.c
+++ b/cli/babeltrace.c
@@ -56,16 +56,18 @@
 static const char* log_level_env_var_names[] = {
        "BABELTRACE_COMMON_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_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_PLUGIN_CTFCOPYTRACE_LIB_LOG_LEVEL",
-       "BABELTRACE_PLUGIN_CTF_FS_SINK_LOG_LEVEL",
+       "BABELTRACE_PYTHON_BT2_LOG_LEVEL",
        "BABELTRACE_PYTHON_PLUGIN_PROVIDER_LOG_LEVEL",
        NULL,
 };