daemon: minor worker initialization fix

diff --git a/daemon/main.c b/daemon/main.c
index 3981c8c9b93864626ffb23da5a90c8c42634ce32..7bced7bcae216e47d1f3e71091554efb8eed1b47 100644 (file)
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -727,20 +727,11 @@ int main(int argc, char **argv)
                return EXIT_FAILURE;
        }
 
-       uv_loop_t *loop = NULL;
-       /* Bind to passed fds and sockets*/
-       if (bind_fds(&engine.net, &args.fd_set, false) != 0 ||
-           bind_fds(&engine.net, &args.tls_fd_set, true) != 0 ||
-           bind_sockets(&engine.net, &args.addr_set, false) != 0 ||
-           bind_sockets(&engine.net, &args.tls_set, true) != 0
-       ) {
-               ret = EXIT_FAILURE;
-               goto cleanup;
-       }
+       uv_loop_t *loop = uv_default_loop();
+       worker->loop = loop;
+       loop->data = worker;
 
        /* Catch some signals. */
-
-       loop = uv_default_loop();
        uv_signal_t sigint, sigterm;
        if (true) ret = uv_signal_init(loop, &sigint);
        if (!ret) ret = uv_signal_init(loop, &sigterm);
@@ -766,10 +757,18 @@ int main(int argc, char **argv)
                goto cleanup;
        }
 
+       /* Bind to passed fds and sockets*/
+       if (bind_fds(&engine.net, &args.fd_set, false) != 0 ||
+           bind_fds(&engine.net, &args.tls_fd_set, true) != 0 ||
+           bind_sockets(&engine.net, &args.addr_set, false) != 0 ||
+           bind_sockets(&engine.net, &args.tls_set, true) != 0
+       ) {
+               ret = EXIT_FAILURE;
+               goto cleanup;
+       }
+
        /* Start the scripting engine */
        engine_set_moduledir(&engine, args.moduledir);
-       worker->loop = loop;
-       loop->data = worker;
 
        if (engine_load_sandbox(&engine) != 0) {
                ret = EXIT_FAILURE;