X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbin%2Flttng-relayd%2Flive.c;h=4ade082b026ef326cda5a7ae5921e9d5a158d1d5;hb=71efa8ef5fdf66ce41199a4735cf88eff0b34174;hp=8a8550f40f60a9a888cf36c8f62d6509f8d3580b;hpb=553b2adb9b58412e42ac11720ef9363d520123f6;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/live.c b/src/bin/lttng-relayd/live.c
index 8a8550f40..4ade082b0 100644
--- a/src/bin/lttng-relayd/live.c
+++ b/src/bin/lttng-relayd/live.c
@@ -452,10 +452,11 @@ struct lttcomm_sock *init_socket(struct lttng_uri *uri)
 	if (ret < 0) {
 		goto error;
 	}
-	DBG("Listening on sock %d for live", sock->fd);
+	DBG("Listening on sock %d for lttng-live", sock->fd);
 
 	ret = sock->ops->bind(sock);
 	if (ret < 0) {
+		PERROR("Failed to bind lttng-live socket");
 		goto error;
 	}
 
@@ -1483,6 +1484,7 @@ static
 int viewer_get_packet(struct relay_connection *conn)
 {
 	int ret;
+	off_t lseek_ret;
 	char *reply = NULL;
 	struct lttng_viewer_get_packet get_packet_info;
 	struct lttng_viewer_trace_packet reply_header;
@@ -1524,9 +1526,9 @@ int viewer_get_packet(struct relay_connection *conn)
 	}
 
 	pthread_mutex_lock(&vstream->stream->lock);
-	ret = lseek(vstream->stream_fd->fd, be64toh(get_packet_info.offset),
+	lseek_ret = lseek(vstream->stream_fd->fd, be64toh(get_packet_info.offset),
 			SEEK_SET);
-	if (ret < 0) {
+	if (lseek_ret < 0) {
 		PERROR("lseek fd %d to offset %" PRIu64, vstream->stream_fd->fd,
 			be64toh(get_packet_info.offset));
 		goto error;
@@ -2073,7 +2075,7 @@ exit:
 error:
 	lttng_poll_clean(&events);
 
-	/* Cleanup reamaining connection object. */
+	/* Cleanup remaining connection object. */
 	rcu_read_lock();
 	cds_lfht_for_each_entry(viewer_connections_ht->ht, &iter.iter,
 			destroy_conn,