Fix: change ERR/PERROR statement to DBG

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

diff --git a/src/bin/lttng-sessiond/consumer.c b/src/bin/lttng-sessiond/consumer.c
index 92a6c5ddc72a0fca50f40fd2c1d03a0b7cddde12..ff55b57df4a59348a93a0047a3fd34e7a5d4011c 100644 (file)
--- a/src/bin/lttng-sessiond/consumer.c
+++ b/src/bin/lttng-sessiond/consumer.c
@@ -91,7 +91,8 @@ int consumer_send_destroy_relayd(struct consumer_socket *sock,
        pthread_mutex_lock(sock->lock);
        ret = lttcomm_send_unix_sock(sock->fd, &msg, sizeof(msg));
        if (ret < 0) {
-               PERROR("send consumer destroy relayd command");
+               /* Indicate that the consumer is probably closing at this point. */
+               DBG("send consumer destroy relayd command");
                goto error_send;
        }
 
@@ -112,7 +113,6 @@ error:
  */
 void consumer_output_send_destroy_relayd(struct consumer_output *consumer)
 {
-       int ret;
        struct lttng_ht_iter iter;
        struct consumer_socket *socket;
 
@@ -123,10 +123,12 @@ void consumer_output_send_destroy_relayd(struct consumer_output *consumer)
                rcu_read_lock();
                cds_lfht_for_each_entry(consumer->socks->ht, &iter.iter, socket,
                                node.node) {
+                       int ret;
+
                        /* Send destroy relayd command */
                        ret = consumer_send_destroy_relayd(socket, consumer);
                        if (ret < 0) {
-                               ERR("Unable to send destroy relayd command to consumer");
+                               DBG("Unable to send destroy relayd command to consumer");
                                /* Continue since we MUST delete everything at this point. */
                        }
                }
@@ -658,7 +660,7 @@ error:
  */
 int consumer_send_relayd_socket(struct consumer_socket *consumer_sock,
                struct lttcomm_sock *sock, struct consumer_output *consumer,
-               enum lttng_stream_type type)
+               enum lttng_stream_type type, unsigned int session_id)
 {
        int ret;
        struct lttcomm_consumer_msg msg;
@@ -682,6 +684,7 @@ int consumer_send_relayd_socket(struct consumer_socket *consumer_sock,
         */
        msg.u.relayd_sock.net_index = consumer->net_seq_index;
        msg.u.relayd_sock.type = type;
+       msg.u.relayd_sock.session_id = session_id;
        memcpy(&msg.u.relayd_sock.sock, sock, sizeof(msg.u.relayd_sock.sock));
 
        DBG3("Sending relayd sock info to consumer on %d", consumer_sock->fd);