From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 22 Jan 2014 19:48:07 +0000 (-0500)
Subject: relayd: add LTTNG_RELAYD_HEALTH env var
X-Git-Tag: v2.5.0-rc1~257
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=094fe907beff2ae08f63225dd0cc1188659f8cf9;p=lttng-tools.git

relayd: add LTTNG_RELAYD_HEALTH env var

Allow override of path leading to health check named pipe.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/doc/man/lttng-relayd.8 b/doc/man/lttng-relayd.8
index 76d8ee357..045ac7a10 100644
--- a/doc/man/lttng-relayd.8
+++ b/doc/man/lttng-relayd.8
@@ -71,6 +71,8 @@ Show version number
 Control timeout of socket connection, receive and send. Takes an integer
 parameter: the timeout value, in milliseconds. A value of 0 or -1 uses
 the timeout of the operating system (this is the default).
+.IP "LTTNG_RELAYD_HEALTH"
+File path used for relay daemon health check communication.
 .PP
 
 .SH "SEE ALSO"
diff --git a/src/bin/lttng-relayd/health-relayd.c b/src/bin/lttng-relayd/health-relayd.c
index 6b4a742f8..01e54d2ea 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,12 +130,32 @@ 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 = NULL, *relayd_path;
 
+	ret = parse_health_env();
+	if (ret) {
+		return ret;
+	}
+
 	is_root = !getuid();
 
 	if (is_root) {
diff --git a/src/bin/lttng-relayd/health-relayd.h b/src/bin/lttng-relayd/health-relayd.h
index 6bfb73b5a..7c7b6e749 100644
--- a/src/bin/lttng-relayd/health-relayd.h
+++ b/src/bin/lttng-relayd/health-relayd.h
@@ -19,8 +19,11 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <limits.h>
 #include <lttng/health-internal.h>
 
+#define LTTNG_RELAYD_HEALTH_ENV		"LTTNG_RELAYD_HEALTH"
+
 enum health_type_relayd {
 	HEALTH_RELAYD_TYPE_DISPATCHER		= 0,
 	HEALTH_RELAYD_TYPE_WORKER		= 1,