Fix: FD leak on thread error

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

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index 18e60d1efbbe40fb45c678adc149b4e3c366468e..c099061ccf7339f03741fc3cda59fb5ae60901a6 100644 (file)
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -239,9 +239,6 @@ void cleanup(void)
        /* Close thread quit pipes */
        utils_close_pipe(thread_quit_pipe);
 
        /* Close thread quit pipes */
        utils_close_pipe(thread_quit_pipe);
 

-       /* Close relay cmd pipes */
-       utils_close_pipe(relay_cmd_pipe);
-

        uri_free(control_uri);
        uri_free(data_uri);
 }
        uri_free(control_uri);
        uri_free(data_uri);
 }


@@ -1813,6 +1810,8 @@ error_poll_create:
 streams_ht_error:
        lttng_ht_destroy(relay_connections_ht);
 relay_connections_ht_error:
 streams_ht_error:
        lttng_ht_destroy(relay_connections_ht);
 relay_connections_ht_error:

+       /* Close relay cmd pipes */
+       utils_close_pipe(relay_cmd_pipe);

        if (err) {
                DBG("Thread exited with error");
        }
        if (err) {
                DBG("Thread exited with error");
        }