X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fenable_channels.c;h=9b5f8d64d302b276f3faee598c30e43dfcde28a2;hp=393fb32ca3263e501dd92262b6d4faa95c3effca;hb=4222434939b65c3abf144866564732d7fd14ed13;hpb=abc9138a92fb32f5525f29160aabd6dc18e441cd

diff --git a/src/bin/lttng/commands/enable_channels.c b/src/bin/lttng/commands/enable_channels.c
index 393fb32ca..9b5f8d64d 100644
--- a/src/bin/lttng/commands/enable_channels.c
+++ b/src/bin/lttng/commands/enable_channels.c
@@ -27,6 +27,8 @@
 
 #include "../command.h"
 
+#include <src/common/sessiond-comm/sessiond-comm.h>
+
 static char *opt_channels;
 static int opt_kernel;
 static char *opt_session_name;
@@ -189,8 +191,17 @@ static int enable_channel(char *session_name)
 
 		ret = lttng_enable_channel(handle, &chan);
 		if (ret < 0) {
-			ERR("Channel %s: %s (session %s)", channel_name,
-					lttng_strerror(ret), session_name);
+			switch (-ret) {
+			case LTTCOMM_KERN_CHAN_EXIST:
+			case LTTCOMM_UST_CHAN_EXIST:
+				WARN("Channel %s: %s (session %s", channel_name,
+						lttng_strerror(ret), session_name);
+				goto error;
+			default:
+				ERR("Channel %s: %s (session %s)", channel_name,
+						lttng_strerror(ret), session_name);
+				break;
+			}
 			warn = 1;
 		} else {
 			MSG("%s channel %s enabled for session %s",