Fix: backported fix uses msec vs sec in stable-2.2
authorDavid Goulet <dgoulet@efficios.com>
Fri, 11 Oct 2013 19:35:39 +0000 (15:35 -0400)
committerDavid Goulet <dgoulet@efficios.com>
Fri, 11 Oct 2013 19:35:39 +0000 (15:35 -0400)
In stable-2.2, setting the timeout expects seconds and not msec like in
stable-2.3 and above. This fixes the previous commit that was backported
from master.

Signed-off-by: David Goulet <dgoulet@efficios.com>
src/bin/lttng-sessiond/main.c

index a70ecda4cd04494e62f266698257a28910944ac7..95e17fd405d052c95dd58026368346465ec0d9a3 100644 (file)
@@ -1802,9 +1802,9 @@ static void *thread_registration_apps(void *data)
                                         * parameter.
                                         */
                                        (void) lttcomm_setsockopt_rcv_timeout(sock,
-                                                       app_socket_timeout * 1000);
+                                                       app_socket_timeout);
                                        (void) lttcomm_setsockopt_snd_timeout(sock,
-                                                       app_socket_timeout * 1000);
+                                                       app_socket_timeout);
 
                                        /*
                                         * Set the CLOEXEC flag. Return code is useless because
This page took 0.030079 seconds and 4 git commands to generate.