*/
#define _GNU_SOURCE
+#define _LGPL_SOURCE
#include <fcntl.h>
#include <getopt.h>
#include <grp.h>
#include "health-relayd.h"
/* Global health check unix path */
-static char health_unix_sock_path[PATH_MAX];
-static char *relayd_path;
-static char *lttng_rundir;
+static
+char health_unix_sock_path[PATH_MAX];
int health_quit_pipe[2];
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;
+ char *home_path = NULL, *rundir = NULL, *relayd_path;
+
+ ret = parse_health_env();
+ if (ret) {
+ return ret;
+ }
is_root = !getuid();
if (is_root) {
- lttng_rundir = strdup(DEFAULT_LTTNG_RUNDIR);
+ rundir = strdup(DEFAULT_LTTNG_RUNDIR);
+ if (!rundir) {
+ ret = -ENOMEM;
+ goto end;
+ }
} else {
/*
* Create rundir from home path. This will create something like
goto end;
}
- ret = asprintf(<tng_rundir, DEFAULT_LTTNG_HOME_RUNDIR, home_path);
+ ret = asprintf(&rundir, DEFAULT_LTTNG_HOME_RUNDIR, home_path);
if (ret < 0) {
ret = -ENOMEM;
goto end;
}
}
- ret = asprintf(&relayd_path, DEFAULT_RELAYD_PATH, lttng_rundir);
+ ret = asprintf(&relayd_path, DEFAULT_RELAYD_PATH, rundir);
if (ret < 0) {
ret = -ENOMEM;
goto end;
}
- ret = create_lttng_rundir_with_perm(lttng_rundir);
+ ret = create_lttng_rundir_with_perm(rundir);
if (ret < 0) {
goto end;
}
}
end:
+ free(rundir);
return ret;
}
goto error;
}
+ lttng_relay_notify_ready();
+
while (1) {
DBG("Health check ready");
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
}
DBG("Health check thread dying");
unlink(health_unix_sock_path);
- (void) rmdir(relayd_path);
- free(relayd_path);
- (void) rmdir(lttng_rundir);
- free(lttng_rundir);
-
if (sock >= 0) {
ret = close(sock);
if (ret) {
}
}
+ /*
+ * We do NOT rmdir rundir nor the relayd path because there are
+ * other processes using them.
+ */
+
lttng_poll_clean(&events);
rcu_unregister_thread();