X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fhealth-relayd.c;h=b14b8277250f25f910588f12f50c293647e291a1;hb=e55c055d9742a9af996214af306ea68c51e168d8;hp=8452c1a6c3886f4aaa11b9e71faa7a358d48d254;hpb=d1f721c52e3810dcb38429cb3beec9f80043aa57;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/health-relayd.c b/src/bin/lttng-relayd/health-relayd.c
index 8452c1a6c..b14b82772 100644
--- a/src/bin/lttng-relayd/health-relayd.c
+++ b/src/bin/lttng-relayd/health-relayd.c
@@ -37,13 +37,12 @@
 #include <sys/mman.h>
 #include <assert.h>
 #include <urcu/compiler.h>
-#include <ulimit.h>
 #include <inttypes.h>
 
 #include <common/defaults.h>
 #include <common/common.h>
-#include <common/consumer.h>
-#include <common/consumer-timer.h>
+#include <common/consumer/consumer.h>
+#include <common/consumer/consumer-timer.h>
 #include <common/compat/poll.h>
 #include <common/sessiond-comm/sessiond-comm.h>
 #include <common/utils.h>
@@ -409,8 +408,9 @@ restart:
 		new_sock = -1;
 	}
 
-exit:
 error:
+	lttng_relay_stop_threads();
+exit:
 	if (err) {
 		ERR("Health error occurred in %s", __func__);
 	}