Fix: consumerd: HT init/teardown with program

[lttng-tools.git] / src / bin / lttng-consumerd / lttng-consumerd.c

diff --git a/src/bin/lttng-consumerd/lttng-consumerd.c b/src/bin/lttng-consumerd/lttng-consumerd.c
index edf1f152f44a5d229fee090fd5b34c5d1146413b..f64ce15331b84253f399989b89b3969a65d2c2cc 100644 (file)
--- a/src/bin/lttng-consumerd/lttng-consumerd.c
+++ b/src/bin/lttng-consumerd/lttng-consumerd.c
@@ -318,7 +318,13 @@ int main(int argc, char **argv)
        }
 
        /* Init */
-       lttng_consumer_init();
+       if (lttng_consumer_init() < 0) {
+               goto error;
+       }
+
+       /* Init socket timeouts */
+       lttcomm_init();
+       lttcomm_inet_init();
 
        if (!getuid()) {
                /* Set limit for open files */
@@ -380,6 +386,9 @@ int main(int argc, char **argv)
        }
        ctx->type = opt_type;
 
+       /* Initialize communication library */
+       lttcomm_init();
+
        /* Create thread to manage channels */
        ret = pthread_create(&channel_thread, NULL, consumer_thread_channel_poll,
                        (void *) ctx);
@@ -469,7 +478,9 @@ metadata_error:
 
 error:
        ret = EXIT_FAILURE;
-       lttng_consumer_send_error(ctx, LTTCOMM_CONSUMERD_EXIT_FAILURE);
+       if (ctx) {
+               lttng_consumer_send_error(ctx, LTTCOMM_CONSUMERD_EXIT_FAILURE);
+       }
 
 end:
        lttng_consumer_destroy(ctx);