logging: Clean up debug logs

[petitboot] / discover / discover-server.c

diff --git a/discover/discover-server.c b/discover/discover-server.c
index 29816ee6a3614d4ad4500b2b7d31307e43fb19dd..41a4fde130a69567020f96bbfe477264a5041e1a 100644 (file)
--- a/discover/discover-server.c
+++ b/discover/discover-server.c
@@ -19,6 +19,7 @@
 
 #include "device-handler.h"
 #include "discover-server.h"
+#include "sysinfo.h"
 
 struct discover_server {
        int socket;
@@ -33,6 +34,7 @@ struct client {
        struct list_item list;
        struct waiter *waiter;
        int fd;
+       bool remote_closed;
 };
 
 
@@ -72,12 +74,12 @@ static void print_clients(struct discover_server *server)
 {
        struct client *client;
 
-       pb_log("current clients [%p,%p,%p]:\n",
+       pb_debug("current clients [%p,%p,%p]:\n",
                        &server->clients.head,
                        server->clients.head.prev,
                        server->clients.head.next);
        list_for_each_entry(&server->clients, client, list)
-               pb_log("\t[%p,%p,%p] client: %d\n", &client->list,
+               pb_debug("\t[%p,%p,%p] client: %d\n", &client->list,
                                client->list.prev, client->list.next,
                                client->fd);
 }
@@ -88,9 +90,12 @@ static int client_write_message(
 {
        int rc;
 
+       if (client->remote_closed)
+               return -1;
+
        rc = pb_protocol_write_message(client->fd, message);
        if (rc)
-               talloc_free(client);
+               client->remote_closed = true;
 
        return rc;
 }
@@ -167,6 +172,24 @@ static int write_boot_status_message(struct discover_server *server,
        return client_write_message(server, client, message);
 }
 
+static int write_system_info_message(struct discover_server *server,
+               struct client *client, const struct system_info *sysinfo)
+{
+       struct pb_protocol_message *message;
+       int len;
+
+       len = pb_protocol_system_info_len(sysinfo);
+
+       message = pb_protocol_create_message(client,
+                       PB_PROTOCOL_ACTION_SYSTEM_INFO, len);
+       if (!message)
+               return -1;
+
+       pb_protocol_serialise_system_info(sysinfo, message->payload, len);
+
+       return client_write_message(server, client, message);
+}
+
 static int discover_server_process_message(void *arg)
 {
        struct pb_protocol_message *message;
@@ -231,6 +254,14 @@ static int discover_server_process_connection(void *arg)
 
        client->fd = fd;
        client->server = server;
+       client->waiter = waiter_register_io(server->waitset, client->fd,
+                               WAIT_IN, discover_server_process_message,
+                               client);
+
+       /* send sysinfo to client */
+       rc = write_system_info_message(server, client, system_info_get());
+       if (rc)
+               return 0;
 
        /* send existing devices to client */
        n_devices = device_handler_get_device_count(server->device_handler);
@@ -251,10 +282,6 @@ static int discover_server_process_connection(void *arg)
                }
        }
 
-       client->waiter = waiter_register_io(server->waitset, client->fd,
-                               WAIT_IN, discover_server_process_message,
-                               client);
-
        return 0;
 }
 
@@ -296,6 +323,15 @@ void discover_server_notify_boot_status(struct discover_server *server,
                write_boot_status_message(server, client, status);
 }
 
+void discover_server_notify_system_info(struct discover_server *server,
+               const struct system_info *sysinfo)
+{
+       struct client *client;
+
+       list_for_each_entry(&server->clients, client, list)
+               write_system_info_message(server, client, sysinfo);
+}
+
 void discover_server_set_device_source(struct discover_server *server,
                struct device_handler *handler)
 {