Keep the base directory of a relay session separate

[lttng-tools.git] / src / bin / lttng-sessiond / ust-consumer.c

diff --git a/src/bin/lttng-sessiond/ust-consumer.c b/src/bin/lttng-sessiond/ust-consumer.c
index 82fd0ea074e0519c2c6bac47c146295e6c861053..eac9956574e6c9e9b284c7d8ef6dd12e9768a370 100644 (file)
--- 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;
@@ -79,7 +81,10 @@ static char *setup_trace_path(struct consumer_output *consumer,
                        }
                }
        } else {
-               ret = snprintf(pathname, PATH_MAX, "%s%s", consumer->subdir,
+               ret = snprintf(pathname, 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");