X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng-sessiond%2Fmain.c;h=55fd5e7bf5622b8a7fc71e5987712bb6c13fcfea;hp=91db9677abdfd24a6d781db11bd47951f95fbed9;hb=63a799e8de095a4e858acf5a264c86d3a84f21af;hpb=f2ca2e251d8f49b0dbbcca529dd61b3562c1147f

diff --git a/lttng-sessiond/main.c b/lttng-sessiond/main.c
index 91db9677a..55fd5e7bf 100644
--- a/lttng-sessiond/main.c
+++ b/lttng-sessiond/main.c
@@ -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";
@@ -1540,13 +1540,21 @@ static pid_t spawn_consumerd(struct consumer_data *consumer_data)
 			 * sessiond's installation directory, and
 			 * fallback on the 32-bit one, 
 			 */
+			DBG3("Looking for a kernel consumer at these locations:");
+			DBG3("	1) %s", consumerd64_bin);
+			DBG3("	2) %s/%s", INSTALL_BIN_PATH, CONSUMERD_FILE);
+			DBG3("	3) %s", consumerd32_bin);
 			if (stat(consumerd64_bin, &st) == 0) {
+				DBG3("Found location #1");
 				consumer_to_use = consumerd64_bin;
 			} else if (stat(INSTALL_BIN_PATH "/" CONSUMERD_FILE, &st) == 0) {
+				DBG3("Found location #2");
 				consumer_to_use = INSTALL_BIN_PATH "/" CONSUMERD_FILE;
 			} else if (stat(consumerd32_bin, &st) == 0) {
+				DBG3("Found location #3");
 				consumer_to_use = consumerd32_bin;
 			} else {
+				DBG("Could not find any valid consumerd executable");
 				break;
 			}
 			DBG("Using kernel consumer at: %s",  consumer_to_use);
@@ -2916,7 +2924,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 +2961,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;
 		}
 	}