X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=lttng-sessiond%2Fmain.c;h=f5f8dbe86a3999d4fb10a30e34f0892ea973dd66;hb=008dd0fe872d71d154867d25579b58a0a204d93d;hp=845ec0684ba69b2a85848d2c3a450889cd078d2c;hpb=bec399405a4667411ae06bbbcbed678e42e93a30;p=lttng-tools.git

diff --git a/lttng-sessiond/main.c b/lttng-sessiond/main.c
index 845ec0684..f5f8dbe86 100644
--- a/lttng-sessiond/main.c
+++ b/lttng-sessiond/main.c
@@ -1157,7 +1157,7 @@ static void *thread_manage_apps(void *data)
 					 */
 					update_ust_app(ust_cmd.sock);
 
-					ret = ustctl_register_done(ust_cmd.sock);
+					ret = ust_app_register_done(ust_cmd.sock);
 					if (ret < 0) {
 						/*
 						 * If the registration is not possible, we simply
@@ -1527,7 +1527,7 @@ static pid_t spawn_consumerd(struct consumer_data *consumer_data)
 		/*
 		 * Exec consumerd.
 		 */
-		if (opt_verbose > 1 || opt_verbose_consumer) {
+		if (opt_verbose_consumer) {
 			verbosity = "--verbose";
 		} else {
 			verbosity = "--quiet";
@@ -2916,7 +2916,7 @@ static int cmd_stop_trace(struct ltt_session *session)
 	usess = session->ust_session;
 
 	if (!session->enabled) {
-		ret = LTTCOMM_UST_START_FAIL;
+		ret = LTTCOMM_UST_STOP_FAIL;
 		goto error;
 	}
 
@@ -2953,7 +2953,7 @@ static int cmd_stop_trace(struct ltt_session *session)
 
 		ret = ust_app_stop_trace_all(usess);
 		if (ret < 0) {
-			ret = LTTCOMM_UST_START_FAIL;
+			ret = LTTCOMM_UST_STOP_FAIL;
 			goto error;
 		}
 	}