lib-master: Don't count FIFOs as clients anymore. We never see them disconnected.

This fixes a problem with shutdown_clients=no when a closed director process
could hang around forever waiting for the FIFO to close.

diff --git a/src/director/notify-connection.c b/src/director/notify-connection.c
index 0a0daf0b49a70420467c5166e0cd0b8b69f5d6ea..665521113b05e613a886325cd526fc81ac1f403d 100644 (file)
--- a/src/director/notify-connection.c
+++ b/src/director/notify-connection.c
@@ -65,6 +65,4 @@ void notify_connection_deinit(struct notify_connection **_conn)
        if (close(conn->fd) < 0)
                i_error("close(notify connection) failed: %m");
        i_free(conn);
-
-       master_service_client_connection_destroyed(master_service);
 }

diff --git a/src/lib-master/master-service.c b/src/lib-master/master-service.c
index c272659b213280292e2dceacd6de22487ec298e5..33c09c6b03f720d436ed9805f586ad077a51f229 100644 (file)
--- a/src/lib-master/master-service.c
+++ b/src/lib-master/master-service.c
@@ -760,6 +760,11 @@ static void master_service_listen(struct master_service_listener *l)
                        i_error("close(service connection) failed: %m");
                master_service_client_connection_destroyed(service);
        }
+       if (conn.fifo) {
+               /* reading FIFOs stays open forever, don't count them
+                  as real clients */
+               master_service_client_connection_destroyed(service);
+       }
 }
 
 static void io_listeners_init(struct master_service *service)

diff --git a/src/log/log-connection.c b/src/log/log-connection.c
index 320d0d28b0e8b9949b02338bbd9a472c3e4b46fb..54b277f242aac55d20a5a59b93d9641351756f4b 100644 (file)
--- a/src/log/log-connection.c
+++ b/src/log/log-connection.c
@@ -282,8 +282,6 @@ void log_connection_destroy(struct log_connection *log)
                i_error("close(log connection fd) failed: %m");
        i_free(log->default_prefix);
        i_free(log);
-
-        master_service_client_connection_destroyed(master_service);
 }
 
 void log_connections_init(void)