X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fhealth-relayd.c;h=89b6402fabad3e62ff69c5e9e8b62e5c15d0d0b8;hb=151b6b1ac2ac1a85b587e578e69b48f6e5feab6a;hp=f2b167c4a0375e58a740d0369551e153854542e8;hpb=65931c8b1d91fd946a2e117a5a1f61eba0b5087a;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/health-relayd.c b/src/bin/lttng-relayd/health-relayd.c
index f2b167c4a..89b6402fa 100644
--- a/src/bin/lttng-relayd/health-relayd.c
+++ b/src/bin/lttng-relayd/health-relayd.c
@@ -53,7 +53,8 @@
 #include "health-relayd.h"
 
 /* Global health check unix path */
-static char health_unix_sock_path[PATH_MAX];
+static
+char health_unix_sock_path[PATH_MAX];
 
 int health_quit_pipe[2];
 
@@ -129,11 +130,31 @@ error:
 	return ret;
 }
 
+static
+int parse_health_env(void)
+{
+	const char *health_path;
+
+	health_path = getenv(LTTNG_RELAYD_HEALTH_ENV);
+	if (health_path) {
+		strncpy(health_unix_sock_path, health_path,
+			PATH_MAX);
+		health_unix_sock_path[PATH_MAX - 1] = '\0';
+	}
+
+	return 0;
+}
+
 static
 int setup_health_path(void)
 {
 	int is_root, ret = 0;
-	char *home_path = NULL, *rundir, *relayd_path;
+	char *home_path = NULL, *rundir = NULL, *relayd_path;
+
+	ret = parse_health_env();
+	if (ret) {
+		return ret;
+	}
 
 	is_root = !getuid();
 
@@ -195,6 +216,7 @@ int setup_health_path(void)
 	}
 
 end:
+	free(rundir);
 	return ret;
 }
 
@@ -278,6 +300,8 @@ void *thread_manage_health(void *data)
 		goto error;
 	}
 
+	lttng_relay_notify_ready();
+
 	while (1) {
 		DBG("Health check ready");
 
@@ -384,6 +408,11 @@ error:
 		}
 	}
 
+	/*
+	 * We do NOT rmdir rundir nor the relayd path because there are
+	 * other processes using them.
+	 */
+
 	lttng_poll_clean(&events);
 
 	rcu_unregister_thread();