From dbc8403ddf4274527a5be169978d5f08991c9501 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Wed, 9 Oct 2013 14:00:13 -0400 Subject: [PATCH] Fix: consumerd/relayd health paths Signed-off-by: Mathieu Desnoyers --- src/bin/lttng-consumerd/health-consumerd.c | 19 +++---------------- src/bin/lttng-relayd/health-relayd.c | 3 ++- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/src/bin/lttng-consumerd/health-consumerd.c b/src/bin/lttng-consumerd/health-consumerd.c index 60808f370..413df9acf 100644 --- a/src/bin/lttng-consumerd/health-consumerd.c +++ b/src/bin/lttng-consumerd/health-consumerd.c @@ -119,8 +119,6 @@ int setup_health_path(void) goto end; } } else { - static char *rundir; - home_path = utils_get_home_dir(); if (home_path == NULL) { /* TODO: Add --socket PATH option */ @@ -129,16 +127,6 @@ int setup_health_path(void) goto end; } - /* - * Create rundir from home path. This will create something like - * $HOME/.lttng - */ - ret = asprintf(&rundir, DEFAULT_LTTNG_HOME_RUNDIR, home_path); - if (ret < 0) { - ret = -ENOMEM; - goto end; - } - /* Set health check Unix path */ if (strlen(health_unix_sock_path) != 0) { goto end; @@ -146,22 +134,21 @@ int setup_health_path(void) switch (type) { case LTTNG_CONSUMER_KERNEL: snprintf(health_unix_sock_path, sizeof(health_unix_sock_path), - DEFAULT_HOME_KCONSUMER_HEALTH_UNIX_SOCK, rundir); + DEFAULT_HOME_KCONSUMER_HEALTH_UNIX_SOCK, home_path); break; case LTTNG_CONSUMER64_UST: snprintf(health_unix_sock_path, sizeof(health_unix_sock_path), - DEFAULT_HOME_USTCONSUMER64_HEALTH_UNIX_SOCK, rundir); + DEFAULT_HOME_USTCONSUMER64_HEALTH_UNIX_SOCK, home_path); break; case LTTNG_CONSUMER32_UST: snprintf(health_unix_sock_path, sizeof(health_unix_sock_path), - DEFAULT_HOME_USTCONSUMER32_HEALTH_UNIX_SOCK, rundir); + DEFAULT_HOME_USTCONSUMER32_HEALTH_UNIX_SOCK, home_path); break; default: ret = -EINVAL; goto end; } } - end: return ret; } diff --git a/src/bin/lttng-relayd/health-relayd.c b/src/bin/lttng-relayd/health-relayd.c index f2b167c4a..61e50367c 100644 --- a/src/bin/lttng-relayd/health-relayd.c +++ b/src/bin/lttng-relayd/health-relayd.c @@ -133,7 +133,7 @@ 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; is_root = !getuid(); @@ -195,6 +195,7 @@ int setup_health_path(void) } end: + free(rundir); return ret; } -- 2.34.1