From 61de0522739f8faff63497f91eee02d02911871f Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Mon, 26 Aug 2019 16:24:21 -0400 Subject: [PATCH] autodisc: improve logging Improve the logging in the support_info_query_all_sources function: - Include the group after a successful query - Include the group when announcing the winner - Format messages according to our standard, "message: key=value, ...". Change-Id: I9833ea63314cde912c1da56d6ed2483f34783f17 Signed-off-by: Simon Marchi Reviewed-on: https://review.lttng.org/c/babeltrace/+/1976 Reviewed-by: Philippe Proulx --- src/autodisc/autodisc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/autodisc/autodisc.c b/src/autodisc/autodisc.c index 1b15c1a1..05b5ed25 100644 --- a/src/autodisc/autodisc.c +++ b/src/autodisc/autodisc.c @@ -496,9 +496,9 @@ auto_source_discovery_internal_status support_info_query_all_sources( } BT_LOGD("babeltrace.support-info query: success: component-class-name=source.%s.%s, input=%s, " - "type=%s, weight=%f\n", + "type=%s, weight=%f, group=%s\n", bt_plugin_get_name(plugin), bt_component_class_get_name(cc), input, - input_type, weight); + input_type, weight, group_value ? bt_value_string_get(group_value) : "(none)"); if (weight > winner.weigth) { winner.source = source_cc; @@ -536,8 +536,8 @@ auto_source_discovery_internal_status support_info_query_all_sources( plugin_name = bt_plugin_get_name(winner.plugin); group = winner.group ? bt_value_string_get(winner.group) : NULL; - BT_LOGI("Input %s is awarded to component class source.%s.%s with weight %f", - input, plugin_name, source_name, winner.weigth); + BT_LOGI("Input awarded: input=%s, type=%s, component-class-name=source.%s.%s, weight=%f, group=%s", + input, input_type, plugin_name, source_name, winner.weigth, group ? group : "(none)"); status = auto_source_discovery_add(auto_disc, plugin_name, source_name, group, input, original_input_index, log_level); @@ -545,7 +545,7 @@ auto_source_discovery_internal_status support_info_query_all_sources( goto error; } } else { - BT_LOGI("Input %s (%s) was not recognized by any source component class.", + BT_LOGI("Input not recognized: input=%s, type=%s", input, input_type); status = AUTO_SOURCE_DISCOVERY_INTERNAL_STATUS_NO_MATCH; } -- 2.34.1