X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=lttng-sessiond%2Fmain.c;h=d1d184d89eae8915d8d8808a638ca245e0b98765;hb=7ebae5217b0b2d8cb897065224a326ccccbce7ac;hp=16dd9ab5dd10d58365f1b04558edf37afcccb71a;hpb=b551a063b85ebdf0accaf2bbe06d0231a7b50f23;p=lttng-tools.git

diff --git a/lttng-sessiond/main.c b/lttng-sessiond/main.c
index 16dd9ab5d..d1d184d89 100644
--- a/lttng-sessiond/main.c
+++ b/lttng-sessiond/main.c
@@ -1057,6 +1057,12 @@ static void *thread_manage_apps(void *data)
 						goto error;
 					}
 
+					/*
+					 * Add channel(s) and event(s) to newly registered apps
+					 * from lttng global UST domain.
+					 */
+					update_ust_app(ust_cmd.sock);
+
 					ret = ustctl_register_done(ust_cmd.sock);
 					if (ret < 0) {
 						/*
@@ -1078,11 +1084,6 @@ static void *thread_manage_apps(void *data)
 								ust_cmd.sock);
 					}
 
-					/*
-					 * Add channel(s) and event(s) to newly registered apps
-					 * from lttng global UST domain.
-					 */
-					update_ust_app(ust_cmd.sock);
 					break;
 				}
 			} else {
@@ -2046,7 +2047,7 @@ static int cmd_enable_channel(struct ltt_session *session,
 	int ret;
 	struct ltt_ust_session *usess = session->ust_session;
 
-	DBG("Enabling channel %s for session %s", session->name, attr->name);
+	DBG("Enabling channel %s for session %s", attr->name, session->name);
 
 	switch (domain->type) {
 	case LTTNG_DOMAIN_KERNEL:
@@ -2095,7 +2096,7 @@ static int cmd_enable_channel(struct ltt_session *session,
 
 		/* Add channel to all registered applications */
 		ret = ust_app_add_channel_all(usess, uchan);
-		if (ret != LTTCOMM_OK) {
+		if (ret != 0) {
 			goto error;
 		}