X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcli%2Fbabeltrace2.c;h=396673d0d63ed996c7b9b601ad8d3c96c9511fa1;hb=ef267d12284b855bc52ee429a5dc12da1d1e3b95;hp=0a3cb5b9f0a0240e0ed3e40f3aa15b7c7d185496;hpb=0d9a3d3edc52d78d00ce114f6c4c50d6d334b9dd;p=babeltrace.git

diff --git a/src/cli/babeltrace2.c b/src/cli/babeltrace2.c
index 0a3cb5b9..396673d0 100644
--- a/src/cli/babeltrace2.c
+++ b/src/cli/babeltrace2.c
@@ -49,16 +49,8 @@
  * modules.
  */
 static const char* log_level_env_var_names[] = {
-	"BABELTRACE_FLT_LTTNG_UTILS_DEBUG_INFO_LOG_LEVEL",
-	"BABELTRACE_PLUGIN_CTF_BFCR_LOG_LEVEL",
 	"BABELTRACE_PLUGIN_CTF_METADATA_LOG_LEVEL",
-	"BABELTRACE_PLUGIN_CTF_MSG_ITER_LOG_LEVEL",
-	"BABELTRACE_PLUGIN_CTF_UTILS_LOG_LEVEL",
 	"BABELTRACE_PYTHON_BT2_LOG_LEVEL",
-	"BABELTRACE_SINK_CTF_FS_LOG_LEVEL",
-	"BABELTRACE_SINK_TEXT_DETAILS_LOG_LEVEL",
-	"BABELTRACE_SRC_CTF_FS_LOG_LEVEL",
-	"BABELTRACE_SRC_CTF_LTTNG_LIVE_LOG_LEVEL",
 	NULL,
 };
 
@@ -2382,7 +2374,7 @@ int cmd_run_ctx_create_components_from_config_components(
 			goto error;
 		}
 
-		BT_ASSERT(cfg_comp->log_level >= BT_LOG_VERBOSE);
+		BT_ASSERT(cfg_comp->log_level >= BT_LOG_TRACE);
 
 		switch (cfg_comp->type) {
 		case BT_COMPONENT_CLASS_TYPE_SOURCE:
@@ -2654,7 +2646,7 @@ int cmd_run(struct bt_config *cfg)
 		printf("%s", bt_common_color_reset());
 		fflush(stdout);
 		fprintf(stderr, "%s", bt_common_color_reset());
-		BT_LOGV("bt_graph_run() returned: status=%s",
+		BT_LOGT("bt_graph_run() returned: status=%s",
 			bt_graph_status_str(graph_status));
 
 		switch (graph_status) {
@@ -2670,7 +2662,7 @@ int cmd_run(struct bt_config *cfg)
 			}
 
 			if (cfg->cmd_data.run.retry_duration_us > 0) {
-				BT_LOGV("Got BT_GRAPH_STATUS_AGAIN: sleeping: "
+				BT_LOGT("Got BT_GRAPH_STATUS_AGAIN: sleeping: "
 					"time-us=%" PRIu64,
 					cfg->cmd_data.run.retry_duration_us);
 
@@ -2747,7 +2739,7 @@ void set_auto_log_levels(struct bt_config *cfg)
 	 */
 	if (getenv("BABELTRACE_DEBUG") &&
 			strcmp(getenv("BABELTRACE_DEBUG"), "1") == 0) {
-		cfg->log_level = BT_LOG_VERBOSE;
+		cfg->log_level = BT_LOG_TRACE;
 	} else if (getenv("BABELTRACE_VERBOSE") &&
 			strcmp(getenv("BABELTRACE_VERBOSE"), "1") == 0) {
 		cfg->log_level = BT_LOG_INFO;
@@ -2759,15 +2751,15 @@ void set_auto_log_levels(struct bt_config *cfg)
 	 * --verbose. So:
 	 *
 	 *     --verbose: INFO log level
-	 *     --debug:   VERBOSE log level (includes DEBUG, which is
-	 *                is less verbose than VERBOSE in the internal
+	 *     --debug:   TRACE log level (includes DEBUG, which is
+	 *                is less verbose than TRACE 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) {
-			bt_logging_set_global_level(BT_LOG_VERBOSE);
+			bt_logging_set_global_level(BT_LOG_TRACE);
 		} else {
 			/*
 			 * Set library's default log level if not
@@ -2781,7 +2773,7 @@ void set_auto_log_levels(struct bt_config *cfg)
 		if (cfg->verbose) {
 			bt_cli_log_level = BT_LOG_INFO;
 		} else if (cfg->debug) {
-			bt_cli_log_level = BT_LOG_VERBOSE;
+			bt_cli_log_level = BT_LOG_TRACE;
 		} else {
 			/*
 			 * Set CLI's default log level if not explicitly
@@ -2796,9 +2788,9 @@ void set_auto_log_levels(struct bt_config *cfg)
 	while (*env_var_name) {
 		if (!getenv(*env_var_name)) {
 			if (cfg->verbose) {
-				g_setenv(*env_var_name, "I", 1);
+				g_setenv(*env_var_name, "INFO", 1);
 			} else if (cfg->debug) {
-				g_setenv(*env_var_name, "V", 1);
+				g_setenv(*env_var_name, "TRACE", 1);
 			} else {
 				char val[2] = { 0 };