X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fhealth-relayd.c;h=89b6402fabad3e62ff69c5e9e8b62e5c15d0d0b8;hb=94143186269a93973df9c0710736bf344cf1c6ea;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..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,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) { @@ -279,6 +300,8 @@ void *thread_manage_health(void *data) goto error; } + lttng_relay_notify_ready(); + while (1) { DBG("Health check ready");