X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=2c1ae3f5132ea3e8a0031dfe6525af733926c535;hp=1a3c22a6c8f87715dc85c878ec5b0c3443d7d1e3;hb=e1f3997aa650554880105d787a864653add7c070;hpb=9a699f7bb912d287630c8940459069a4b04d2399

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 1a3c22a6c..2c1ae3f51 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -167,14 +167,14 @@ static int get_kernel_runtime_stats(struct ltt_session *session,
 		goto end;
 	}
 
-	ret = consumer_get_discarded_events(session->id, kchan->fd,
+	ret = consumer_get_discarded_events(session->id, kchan->key,
 			session->kernel_session->consumer,
 			discarded_events);
 	if (ret < 0) {
 		goto end;
 	}
 
-	ret = consumer_get_lost_packets(session->id, kchan->fd,
+	ret = consumer_get_lost_packets(session->id, kchan->key,
 			session->kernel_session->consumer,
 			lost_packets);
 	if (ret < 0) {
@@ -877,8 +877,11 @@ static int create_connect_relayd(struct lttng_uri *uri,
 
 		/* Check relayd version */
 		ret = relayd_version_check(rsock);
-		if (ret < 0) {
-			ret = LTTNG_ERR_RELAYD_VERSION_FAIL;
+		if (ret == LTTNG_ERR_RELAYD_VERSION_FAIL) {
+			goto close_sock;
+		} else if (ret < 0) {
+			ERR("Unable to reach lttng-relayd");
+			ret = LTTNG_ERR_RELAYD_CONNECT_FAIL;
 			goto close_sock;
 		}
 		consumer->relay_major_version = rsock->major;