Fix: honor negative (unlimited) app socket timeout

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

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index b0674612b54589de311bdfa0e76117226675223e..1964fe0cca3b80e57b8293d00aa12cfb92d18790 100644 (file)
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -760,12 +760,6 @@ static void sessiond_cleanup_options(void)
        free(kmod_extra_probes_list);
 
        run_as_destroy_worker();
-
-       /* <fun> */
-       DBG("%c[%d;%dm*** assert failed :-) *** ==> %c[%dm%c[%d;%dm"
-                       "Matthew, BEET driven development works!%c[%dm",
-                       27, 1, 31, 27, 0, 27, 1, 33, 27, 0);
-       /* </fun> */
 }
 
 /*
@@ -2201,10 +2195,12 @@ static void *thread_registration_apps(void *data)
                                         * lttcomm_setsockopt_snd_timeout expect msec as
                                         * parameter.
                                         */
-                                       (void) lttcomm_setsockopt_rcv_timeout(sock,
-                                                       app_socket_timeout * 1000);
-                                       (void) lttcomm_setsockopt_snd_timeout(sock,
-                                                       app_socket_timeout * 1000);
+                                       if (app_socket_timeout >= 0) {
+                                               (void) lttcomm_setsockopt_rcv_timeout(sock,
+                                                               app_socket_timeout * 1000);
+                                               (void) lttcomm_setsockopt_snd_timeout(sock,
+                                                               app_socket_timeout * 1000);
+                                       }
 
                                        /*
                                         * Set the CLOEXEC flag. Return code is useless because