X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel-consumer.c;h=a3295e9279923bb43141a5e2af75b3133717b5de;hb=17136d8c6c88034daa1f214ee1716c59d6e4fd95;hp=236ce0eb6abe2948213e01ec5e2816ba8d62495f;hpb=e5148e25a481691b3278cd85a6ff25c1e25e4d2e;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/kernel-consumer.c b/src/bin/lttng-sessiond/kernel-consumer.c
index 236ce0eb6..a3295e927 100644
--- a/src/bin/lttng-sessiond/kernel-consumer.c
+++ b/src/bin/lttng-sessiond/kernel-consumer.c
@@ -42,7 +42,10 @@ static char *create_channel_path(struct consumer_output *consumer)
 	assert(consumer);
 
 	/* Get the right path name destination */
-	if (consumer->type == CONSUMER_DST_LOCAL) {
+	if (consumer->type == CONSUMER_DST_LOCAL ||
+			(consumer->type == CONSUMER_DST_NET &&
+					consumer->relay_major_version == 2 &&
+					consumer->relay_minor_version >= 11)) {
 		pathname = strdup(consumer->domain_subdir);
 		if (!pathname) {
 			PERROR("Failed to copy domain subdirectory string %s",
@@ -159,6 +162,7 @@ int kernel_consumer_add_channel(struct consumer_socket *sock,
 			channel->channel->attr.tracefile_count,
 			monitor,
 			channel->channel->attr.live_timer_interval,
+			ksession->is_live_session,
 			channel_attr_extended->monitor_timer_interval,
 			ksession->current_trace_chunk);
 
@@ -227,16 +231,21 @@ int kernel_consumer_add_metadata(struct consumer_socket *sock,
 	consumer_init_add_channel_comm_msg(&lkm,
 			ksession->metadata->key,
 			ksession->id,
-			DEFAULT_KERNEL_TRACE_DIR,
+			"",
 			ksession->uid,
 			ksession->gid,
 			consumer->net_seq_index,
-			DEFAULT_METADATA_NAME,
+			ksession->metadata->conf->name,
 			1,
-			DEFAULT_KERNEL_CHANNEL_OUTPUT,
+			ksession->metadata->conf->attr.output,
 			CONSUMER_CHANNEL_TYPE_METADATA,
-			0, 0,
-			monitor, 0, 0, ksession->current_trace_chunk);
+			ksession->metadata->conf->attr.tracefile_size,
+			ksession->metadata->conf->attr.tracefile_count,
+			monitor,
+			ksession->metadata->conf->attr.live_timer_interval,
+			ksession->is_live_session,
+			0,
+			ksession->current_trace_chunk);
 
 	health_code_update();