Log server messages to file

[petitboot] / discover / pb-discover.c

diff --git a/discover/pb-discover.c b/discover/pb-discover.c
index 63aaf0089543965a228849dcdccadceaa16c02fe..2b04e62ee0247ab95d153325c9d3f2f865ca28bb 100644 (file)
--- a/discover/pb-discover.c
+++ b/discover/pb-discover.c
@@ -1,22 +1,43 @@
 
+#include <assert.h>
 #include <stdlib.h>
 #include <signal.h>
 
+#include <waiter/waiter.h>
+#include <log/log.h>
+
 #include "udev.h"
 #include "discover-server.h"
 #include "device-handler.h"
-#include "waiter.h"
-#include "log.h"
+
+static int running;
+
+static void sigint_handler(int __attribute__((unused)) signum)
+{
+       running = 0;
+}
 
 int main(void)
 {
        struct device_handler *handler;
        struct discover_server *server;
        struct udev *udev;
+       FILE *log;
+
+       log = fopen("pb-discover.log", "a");
+       assert(log);
+       pb_log_set_stream(log);
+
+#if defined(DEBUG)
+       pb_log_always_flush(1);
+#endif
+       pb_log("--- pb-discover ---\n");
 
        /* we look for closed sockets when we write, so ignore SIGPIPE */
        signal(SIGPIPE, SIG_IGN);
 
+       signal(SIGINT, sigint_handler);
+
        server = discover_server_init();
        if (!server)
                return EXIT_FAILURE;
@@ -27,15 +48,18 @@ int main(void)
 
        discover_server_set_device_source(server, handler);
 
-       udev = udev_init();
+       udev = udev_init(handler);
        if (!udev)
                return EXIT_FAILURE;
 
-       for (;;) {
+       for (running = 1; running;) {
                if (waiter_poll())
-                       return EXIT_FAILURE;
+                       break;
        }
 
+       device_handler_destroy(handler);
+
+       pb_log("--- end ---\n");
 
        return EXIT_SUCCESS;
 }