X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fhealth-relayd.c;h=e3e48c9195a6bdd2a411c8e31aa1a2f198d19afe;hb=e8fa9fb0539ec3d734f6d0ab91220b4538b2ea30;hp=6b4a742f8e5fa95066e29b3e922ff13bd449eb31;hpb=dcbcae3e305b65785461b4c7bbc60864e03208a2;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/health-relayd.c b/src/bin/lttng-relayd/health-relayd.c
index 6b4a742f8..e3e48c919 100644
--- a/src/bin/lttng-relayd/health-relayd.c
+++ b/src/bin/lttng-relayd/health-relayd.c
@@ -16,6 +16,7 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <fcntl.h>
 #include <getopt.h>
 #include <grp.h>
@@ -48,12 +49,14 @@
 #include <common/compat/poll.h>
 #include <common/sessiond-comm/sessiond-comm.h>
 #include <common/utils.h>
+#include <common/compat/getenv.h>
 
 #include "lttng-relayd.h"
 #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,16 +132,40 @@ error:
 	return ret;
 }
 
+static
+int parse_health_env(void)
+{
+	const char *health_path;
+
+	health_path = lttng_secure_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 = NULL, *relayd_path;
 
+	ret = parse_health_env();
+	if (ret) {
+		return ret;
+	}
+
 	is_root = !getuid();
 
 	if (is_root) {
 		rundir = strdup(DEFAULT_LTTNG_RUNDIR);
+		if (!rundir) {
+			ret = -ENOMEM;
+			goto end;
+		}
 	} else {
 		/*
 		 * Create rundir from home path. This will create something like
@@ -279,6 +306,8 @@ void *thread_manage_health(void *data)
 		goto error;
 	}
 
+	lttng_relay_notify_ready();
+
 	while (1) {
 		DBG("Health check ready");
 
@@ -302,6 +331,11 @@ restart:
 			revents = LTTNG_POLL_GETEV(&events, i);
 			pollfd = LTTNG_POLL_GETFD(&events, i);
 
+			if (!revents) {
+				/* No activity for this FD (poll implementation). */
+				continue;
+			}
+
 			/* Thread quit pipe has been closed. Killing thread. */
 			ret = check_health_quit_pipe(pollfd, revents);
 			if (ret) {
@@ -345,7 +379,7 @@ restart:
 
 		assert(msg.cmd == HEALTH_CMD_CHECK);
 
-		reply.ret_code = 0;
+		memset(&reply, 0, sizeof(reply));
 		for (i = 0; i < NR_HEALTH_RELAYD_TYPES; i++) {
 			/*
 			 * health_check_state return 0 if thread is in