X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fagent.c;h=b726e0184124a3732641611694031116f54f92c7;hp=9832e5ef99b921c46577a6fdc83358712519e778;hb=85b053182c4e300c717483ad231f5c04cbf5e4b7;hpb=26d0e3569499275a072d80c811825045e3291aed

diff --git a/src/bin/lttng-sessiond/agent.c b/src/bin/lttng-sessiond/agent.c
index 9832e5ef9..b726e0184 100644
--- a/src/bin/lttng-sessiond/agent.c
+++ b/src/bin/lttng-sessiond/agent.c
@@ -17,6 +17,7 @@
 #include <lttng/condition/condition.h>
 #include <lttng/condition/on-event.h>
 #include <lttng/domain-internal.h>
+#include <lttng/log-level-rule-internal.h>
 
 #include <common/common.h>
 #include <common/sessiond-comm/agent.h>
@@ -1243,6 +1244,7 @@ struct agent_event *agent_find_event_by_trigger(
 	const struct lttng_event_rule *rule;
 	const char *name;
 	const char *filter_expression;
+	const struct lttng_log_level_rule *log_level_rule;
 	/* Unused when loglevel_type is 'ALL'. */
 	int loglevel_value = 0;
 	enum lttng_loglevel_type loglevel_type;
@@ -1272,14 +1274,16 @@ struct agent_event *agent_find_event_by_trigger(
 	/* Get the internal filter expression. */
 	filter_expression = lttng_event_rule_get_filter(rule);
 
-	er_status = lttng_event_rule_tracepoint_get_log_level_type(
-			rule, &loglevel_type);
-	assert(er_status == LTTNG_EVENT_RULE_STATUS_OK);
-
-	if (loglevel_type != LTTNG_EVENT_LOGLEVEL_ALL) {
-		er_status = lttng_event_rule_tracepoint_get_log_level(
-				rule, &loglevel_value);
-		assert(er_status == LTTNG_EVENT_RULE_STATUS_OK);
+	/* Map log_level_rule to loglevel value. */
+	er_status = lttng_event_rule_tracepoint_get_log_level_rule(
+			rule, &log_level_rule);
+	if (er_status == LTTNG_EVENT_RULE_STATUS_UNSET) {
+		loglevel_type = LTTNG_EVENT_LOGLEVEL_ALL;
+		loglevel_value = 0;
+	} else if (er_status == LTTNG_EVENT_RULE_STATUS_OK) {
+		lttng_log_level_rule_to_loglevel(log_level_rule, &loglevel_type, &loglevel_value);
+	} else {
+		abort();
 	}
 
 	return agent_find_event(name, loglevel_type, loglevel_value,