master: Add master socket's io listener later.

Most importantly this fixes startup failure with kqueue:

Panic: kevent(EV_ADD, READ, 56) failed: Bad file descriptor

kqueue doesn't survive a fork(), so this change delays its creation until
after fork().

diff --git a/src/master/service-listen.c b/src/master/service-listen.c
index 1d3e399a7e7a5fcc1ed7b042592a6b1dfeee0f53..96b52e8ef0ee76f42c144064970671e57022aa7d 100644 (file)
--- a/src/master/service-listen.c
+++ b/src/master/service-listen.c
@@ -6,7 +6,6 @@
 #include "fd-close-on-exec.h"
 #include "ioloop.h"
 #include "net.h"
-#include "master-client.h"
 #ifdef HAVE_SYSTEMD
 #include "sd-daemon.h"
 #endif
@@ -357,10 +356,6 @@ static int services_listen_master(struct service_list *service_list)
 
        if (service_list->master_fd == -1)
                return 0;
-
-       service_list->io_master =
-               io_add(service_list->master_fd, IO_READ,
-                      master_client_connected, service_list);
        return 1;
 }
 

diff --git a/src/master/service-monitor.c b/src/master/service-monitor.c
index 44cdb2696b2f4bb905245f825c482d0b0a2b8f69..408edf4d2918566f67188ad9d14287b47e8aa300 100644 (file)
--- a/src/master/service-monitor.c
+++ b/src/master/service-monitor.c
@@ -7,6 +7,7 @@
 #include "hash.h"
 #include "str.h"
 #include "safe-mkstemp.h"
+#include "master-client.h"
 #include "service.h"
 #include "service-process.h"
 #include "service-process-notify.h"
@@ -452,6 +453,12 @@ void services_monitor_start(struct service_list *service_list)
                return;
        service_anvil_monitor_start(service_list);
 
+       if (service_list->io_master == NULL) {
+               service_list->io_master =
+                       io_add(service_list->master_fd, IO_READ,
+                              master_client_connected, service_list);
+       }
+
        array_foreach(&service_list->services, services) {
                struct service *service = *services;