X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-consumerd%2Fhealth-consumerd.c;fp=src%2Fbin%2Flttng-consumerd%2Fhealth-consumerd.c;h=413df9acfb92eff3ad4e3566708c7709edd6fe24;hp=60808f37094d304480468875c5cde6b944599c9c;hb=dbc8403ddf4274527a5be169978d5f08991c9501;hpb=8c6c56c2c6577c540786b341e5334f676c12d43a

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;
 }