X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=cli%2Fbabeltrace.c;h=3c44db359025eb3e73936eb2b129ceac64d81b76;hb=b4565e8b2e0f7c0e356919fe95b760bed7a71d1b;hp=668491e7bdaecbb02afbd50a55f2cc6f32b3eee7;hpb=56b43721cde738dace9fc445bcf388e944686cbc;p=babeltrace.git

diff --git a/cli/babeltrace.c b/cli/babeltrace.c
index 668491e7..3c44db35 100644
--- a/cli/babeltrace.c
+++ b/cli/babeltrace.c
@@ -65,11 +65,14 @@
  * modules.
  */
 static const char* log_level_env_var_names[] = {
+	"BABELTRACE_COMMON_LOG_LEVEL",
 	"BABELTRACE_PLUGIN_CTF_BTR_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_LTTNG_UTILS_DEBUG_INFO_FLT_LOG_LEVEL",
+	"BABELTRACE_PLUGIN_UTILS_TRIMMER_FLT_LOG_LEVEL",
 	"BABELTRACE_PYTHON_PLUGIN_PROVIDER_LOG_LEVEL",
 	NULL,
 };
@@ -1918,6 +1921,19 @@ void set_auto_log_levels(struct bt_config *cfg)
 {
 	const char **env_var_name;
 
+	/*
+	 * Override the configuration's default log level if
+	 * BABELTRACE_VERBOSE or BABELTRACE_DEBUG environment variables
+	 * are found for backward compatibility with legacy Babetrace 1.
+	 */
+	if (getenv("BABELTRACE_DEBUG") &&
+			strcmp(getenv("BABELTRACE_DEBUG"), "1") == 0) {
+		cfg->log_level = 'V';
+	} else if (getenv("BABELTRACE_VERBOSE") &&
+			strcmp(getenv("BABELTRACE_VERBOSE"), "1") == 0) {
+		cfg->log_level = 'I';
+	}
+
 	/*
 	 * Set log levels according to --debug or --verbose. For
 	 * backward compatibility, --debug is more verbose than
@@ -2026,9 +2042,6 @@ void set_auto_log_levels(struct bt_config *cfg)
 
 		env_var_name++;
 	}
-
-	babeltrace_debug = cfg->debug;
-	babeltrace_verbose = cfg->verbose;
 }
 
 static