X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=91e085290eb1221dc62cb801e0fd0fafe984eabb;hb=a76cbd9f0350826e05c238b73425ff4e5825cc96;hp=a117a1f1cfc8dd12cd02049455dbe82384825e04;hpb=868e733e4078dc417c58039003ee8744059b7727;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index a117a1f1c..91e085290 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -406,13 +406,13 @@ static void close_consumer_sockets(void)
 	if (ustconsumer32_data.err_sock >= 0) {
 		ret = close(ustconsumer32_data.err_sock);
 		if (ret < 0) {
-			PERROR("UST consumer32 err_sock close");
+			PERROR("UST consumerd32 err_sock close");
 		}
 	}
 	if (ustconsumer64_data.err_sock >= 0) {
 		ret = close(ustconsumer64_data.err_sock);
 		if (ret < 0) {
-			PERROR("UST consumer64 err_sock close");
+			PERROR("UST consumerd64 err_sock close");
 		}
 	}
 	if (kconsumer_data.cmd_sock >= 0) {
@@ -424,13 +424,13 @@ static void close_consumer_sockets(void)
 	if (ustconsumer32_data.cmd_sock >= 0) {
 		ret = close(ustconsumer32_data.cmd_sock);
 		if (ret < 0) {
-			PERROR("UST consumer32 cmd_sock close");
+			PERROR("UST consumerd32 cmd_sock close");
 		}
 	}
 	if (ustconsumer64_data.cmd_sock >= 0) {
 		ret = close(ustconsumer64_data.cmd_sock);
 		if (ret < 0) {
-			PERROR("UST consumer64 cmd_sock close");
+			PERROR("UST consumerd64 cmd_sock close");
 		}
 	}
 }
@@ -1149,12 +1149,14 @@ error:
 		if (ret) {
 			PERROR("close");
 		}
+		consumer_data->err_sock = -1;
 	}
 	if (consumer_data->cmd_sock >= 0) {
 		ret = close(consumer_data->cmd_sock);
 		if (ret) {
 			PERROR("close");
 		}
+		consumer_data->cmd_sock = -1;
 	}
 	if (consumer_data->metadata_sock.fd >= 0) {
 		ret = close(consumer_data->metadata_sock.fd);