X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconfig%2Fconfig.c;h=6834d7a54427e72502fd0a635de4e3735c49fb85;hb=81527d36f84a02110360f0332f3b35f2d3024d17;hp=140f3b6dc097371de12f15185b4710dd0c6f8579;hpb=f76d886f794c80a3c761613532d6a9a72a918cb8;p=lttng-tools.git

diff --git a/src/common/config/config.c b/src/common/config/config.c
index 140f3b6dc..6834d7a54 100644
--- a/src/common/config/config.c
+++ b/src/common/config/config.c
@@ -1427,6 +1427,26 @@ int process_event_node(xmlNodePtr event_node, struct lttng_handle *handle,
 
 	memset(&event, 0, sizeof(event));
 
+	/* Initialize default log level which varies by domain */
+	switch (handle->domain.type)
+	{
+	case LTTNG_DOMAIN_JUL:
+		event.loglevel = LTTNG_LOGLEVEL_JUL_ALL;
+		break;
+	case LTTNG_DOMAIN_LOG4J:
+		event.loglevel = LTTNG_LOGLEVEL_LOG4J_ALL;
+		break;
+	case LTTNG_DOMAIN_PYTHON:
+		event.loglevel = LTTNG_LOGLEVEL_PYTHON_DEBUG;
+		break;
+	case LTTNG_DOMAIN_UST:
+	case LTTNG_DOMAIN_KERNEL:
+		event.loglevel = LTTNG_LOGLEVEL_DEBUG;
+		break;
+	default:
+		assert(0);
+	}
+
 	for (node = xmlFirstElementChild(event_node); node;
 		node = xmlNextElementSibling(node)) {
 		if (!strcmp((const char *) node->name, config_element_name)) {
@@ -2095,7 +2115,7 @@ static
 int process_pid_tracker_node(xmlNodePtr pid_tracker_node,
 	struct lttng_handle *handle)
 {
-	int ret, child;
+	int ret = 0, child;
 	xmlNodePtr targets_node = NULL;
 	xmlNodePtr node;