Fix relayd: stream index file created in the wrong directory

[lttng-tools.git] / src / bin / lttng-relayd / stream.c

diff --git a/src/bin/lttng-relayd/stream.c b/src/bin/lttng-relayd/stream.c
index 0ababf28d8d112c55b304d5a1baafb252077fe0e..41d44a58598ff9033dfea8cdd69d44f0a63de75b 100644 (file)
--- a/src/bin/lttng-relayd/stream.c
+++ b/src/bin/lttng-relayd/stream.c
@@ -82,13 +82,14 @@ struct relay_stream *stream_create(struct ctf_trace *trace,
        }
 
        stream->stream_handle = stream_handle;
-       stream->prev_seq = -1ULL;
+       stream->prev_data_seq = -1ULL;
        stream->prev_index_seq = -1ULL;
        stream->last_net_seq_num = -1ULL;
        stream->ctf_stream_id = -1ULL;
        stream->tracefile_size = tracefile_size;
        stream->tracefile_count = tracefile_count;
        stream->path_name = path_name;
+       stream->prev_path_name = NULL;
        stream->channel_name = channel_name;
        stream->rotate_at_seq_num = -1ULL;
        lttng_ht_node_init_u64(&stream->node, stream->stream_handle);
@@ -255,6 +256,7 @@ static void stream_destroy(struct relay_stream *stream)
                tracefile_array_destroy(stream->tfa);
        }
        free(stream->path_name);
+       free(stream->prev_path_name);
        free(stream->channel_name);
        free(stream);
 }
@@ -377,7 +379,7 @@ void try_stream_close(struct relay_stream *stream)
        }
 
        if (stream->last_net_seq_num != -1ULL &&
-                       ((int64_t) (stream->prev_seq - stream->last_net_seq_num)) < 0
+                       ((int64_t) (stream->prev_data_seq - stream->last_net_seq_num)) < 0
                        && !session_aborted) {
                /*
                 * Don't close since we still have data pending. This