X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-consumer.c;h=a431a19f01ac8e9706caf5201529f0559586f4d9;hb=366a9222abc182bf77de1b806256aa9a9dc8832a;hp=43bf2616a2c4a93ba91f81f2a6f60476289dbe7c;hpb=491d15395b58df09f8a3e7ba7404eb1f46392b79;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-consumer.c b/src/bin/lttng-sessiond/ust-consumer.c
index 43bf2616a..a431a19f0 100644
--- a/src/bin/lttng-sessiond/ust-consumer.c
+++ b/src/bin/lttng-sessiond/ust-consumer.c
@@ -62,8 +62,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, 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;
@@ -321,7 +323,6 @@ int ust_consumer_get_channel(struct consumer_socket *socket,
 			free(stream);
 			if (ret == -LTTNG_UST_ERR_NOENT) {
 				DBG3("UST app consumer has no more stream available");
-				ret = 0;
 				break;
 			}
 			if (ret != -EPIPE) {