X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-consumer.c;h=d8d6c329f5d3334555f05e0418a699c46cec6dce;hb=d086f507d02078aed618ab291a0bc4a634958fa3;hp=82fd0ea074e0519c2c6bac47c146295e6c861053;hpb=4a171f3e17f4799d52e13d385f195fd459b8d008;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-consumer.c b/src/bin/lttng-sessiond/ust-consumer.c
index 82fd0ea07..d8d6c329f 100644
--- a/src/bin/lttng-sessiond/ust-consumer.c
+++ b/src/bin/lttng-sessiond/ust-consumer.c
@@ -53,8 +53,11 @@ static char *setup_trace_path(struct consumer_output *consumer,
 
 	health_code_update();
 
-	/* Allocate our self the string to make sure we never exceed PATH_MAX. */
-	pathname = zmalloc(PATH_MAX);
+	/*
+	 * Allocate the string ourself to make sure we never exceed
+	 * LTTNG_PATH_MAX.
+	 */
+	pathname = zmalloc(LTTNG_PATH_MAX);
 	if (!pathname) {
 		goto error;
 	}
@@ -62,8 +65,10 @@ static char *setup_trace_path(struct consumer_output *consumer,
 	/* Get correct path name destination */
 	if (consumer->type == CONSUMER_DST_LOCAL) {
 		/* Set application path to the destination path */
-		ret = snprintf(pathname, PATH_MAX, "%s%s%s",
-				consumer->dst.trace_path, consumer->subdir, ua_sess->path);
+		ret = snprintf(pathname, LTTNG_PATH_MAX, "%s%s%s%s",
+				consumer->dst.session_root_path,
+				consumer->chunk_path,
+				consumer->subdir, ua_sess->path);
 		if (ret < 0) {
 			PERROR("snprintf channel path");
 			goto error;
@@ -79,7 +84,10 @@ static char *setup_trace_path(struct consumer_output *consumer,
 			}
 		}
 	} else {
-		ret = snprintf(pathname, PATH_MAX, "%s%s", consumer->subdir,
+		ret = snprintf(pathname, LTTNG_PATH_MAX, "%s%s%s%s",
+				consumer->dst.net.base_dir,
+				consumer->chunk_path,
+				consumer->subdir,
 				ua_sess->path);
 		if (ret < 0) {
 			PERROR("snprintf channel path");