Fix: don't print stream name in error message

[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 78f29f497b7f69fb127bb24f78d7ce1a6f769654..da0d8d3f4214fb298e1451eb35fb387c083ef6a0 100644 (file)
--- a/src/bin/lttng-sessiond/ust-consumer.c
+++ b/src/bin/lttng-sessiond/ust-consumer.c
@@ -102,7 +102,7 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
                struct ust_app_channel *ua_chan, struct consumer_output *consumer,
                struct consumer_socket *socket, struct ust_registry_session *registry)
 {
-       int ret;
+       int ret, output;
        uint32_t chan_id;
        uint64_t key, chan_reg_key;
        char *pathname = NULL;
@@ -141,13 +141,20 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
                chan_id = chan_reg->chan_id;
        }
 
+       switch (ua_chan->attr.output) {
+       case LTTNG_UST_MMAP:
+       default:
+               output = LTTNG_EVENT_MMAP;
+               break;
+       }
+
        consumer_init_ask_channel_comm_msg(&msg,
                        ua_chan->attr.subbuf_size,
                        ua_chan->attr.num_subbuf,
                        ua_chan->attr.overwrite,
                        ua_chan->attr.switch_timer_interval,
                        ua_chan->attr.read_timer_interval,
-                       (int) ua_chan->attr.output,
+                       output,
                        (int) ua_chan->attr.type,
                        ua_sess->tracing_id,
                        pathname,
@@ -373,8 +380,8 @@ int ust_consumer_send_stream_to_ust(struct ust_app *app,
        ret = ustctl_send_stream_to_ust(app->sock, channel->obj, stream->obj);
        if (ret < 0) {
                if (ret != -EPIPE && ret != -LTTNG_UST_ERR_EXITING) {
-                       ERR("Error ustctl send stream %s to app pid: %d with ret %d",
-                                       stream->name, app->pid, ret);
+                       ERR("ustctl send stream handle %d to app pid: %d with ret %d",
+                                       stream->obj->handle, app->pid, ret);
                } else {
                        DBG3("UST app send stream to ust failed. Application is dead.");
                }