From: David Goulet <dgoulet@efficios.com>
Date: Fri, 23 May 2014 19:04:23 +0000 (-0400)
Subject: Fix: don't send consumer error to sessiond in teardown
X-Git-Tag: v2.5.0-rc1~17
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=e1905bf3575cfb2662e1f755500954824a102f2a;hp=c66f2a27dd7d3394775f4a9a942c899c973c3b42

Fix: don't send consumer error to sessiond in teardown

At that point, the control socket has been closed thus the session
daemon is aware that the consumer died. The consumer exit reason is not
even handled by the session daemon.

In the case of the session daemon tearing down, the consumer should
avoid trying to send data on a potentially closed socket.

Signed-off-by: David Goulet <dgoulet@efficios.com>
---

diff --git a/src/bin/lttng-consumerd/lttng-consumerd.c b/src/bin/lttng-consumerd/lttng-consumerd.c
index e226ebc69..88ce19019 100644
--- a/src/bin/lttng-consumerd/lttng-consumerd.c
+++ b/src/bin/lttng-consumerd/lttng-consumerd.c
@@ -520,15 +520,11 @@ health_error:
 error_health_pipe:
 	if (!ret) {
 		ret = EXIT_SUCCESS;
-		lttng_consumer_send_error(ctx, LTTCOMM_CONSUMERD_EXIT_SUCCESS);
 		goto end;
 	}
 
 error:
 	ret = EXIT_FAILURE;
-	if (ctx) {
-		lttng_consumer_send_error(ctx, LTTCOMM_CONSUMERD_EXIT_FAILURE);
-	}
 
 end:
 	lttng_consumer_destroy(ctx);