From: Antoine Busque <abusque@efficios.com>
Date: Wed, 2 Sep 2015 00:21:00 +0000 (-0400)
Subject: Fix: don't print the default channel name when enabling agent events
X-Git-Tag: v2.6.1~17
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=6b0f296133aaf1cea29b66ba9b5ebc7c75bf5d70;p=lttng-tools.git

Fix: don't print the default channel name when enabling agent events

Enabling an event in the python domain erroneously reported the
channel as being the default `channel0`. Instead, don't report the
channel name when enabling an event in an agent domain.

Fixes: #910

Signed-off-by: Antoine Busque <abusque@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/bin/lttng/commands/enable_events.c b/src/bin/lttng/commands/enable_events.c
index 50734c059..063c7cc35 100644
--- a/src/bin/lttng/commands/enable_events.c
+++ b/src/bin/lttng/commands/enable_events.c
@@ -1156,17 +1156,28 @@ static int enable_events(char *session_name)
 				}
 				error_holder = command_ret;
 			} else {
-				/* So we don't print the default channel name for agent domain. */
-				if (dom.type == LTTNG_DOMAIN_JUL ||
-						dom.type == LTTNG_DOMAIN_LOG4J) {
-					MSG("%s event %s%s enabled.",
-							get_domain_str(dom.type), event_name,
-							exclusion_string);
-				} else {
+				switch (dom.type) {
+				case LTTNG_DOMAIN_KERNEL:
+				case LTTNG_DOMAIN_UST:
 					MSG("%s event %s%s created in channel %s",
-							get_domain_str(dom.type), event_name,
-							exclusion_string,
-							print_channel_name(channel_name));
+						get_domain_str(dom.type),
+						event_name,
+						exclusion_string,
+						print_channel_name(channel_name));
+					break;
+				case LTTNG_DOMAIN_JUL:
+				case LTTNG_DOMAIN_LOG4J:
+					/*
+					 * Don't print the default channel
+					 * name for agent domains.
+					 */
+					MSG("%s event %s%s enabled.",
+						get_domain_str(dom.type),
+						event_name,
+						exclusion_string);
+					break;
+				default:
+					assert(0);
 				}
 			}
 			free(exclusion_string);