discover: Add debug flag to config

[petitboot] / discover / pb-discover.c

diff --git a/discover/pb-discover.c b/discover/pb-discover.c
index bd515e327cc9c94d75cd0c9ec3eb9de622a553ca..fd370685653f979419943ee03db5c3b64f311f5f 100644 (file)
--- a/discover/pb-discover.c
+++ b/discover/pb-discover.c
@@ -7,14 +7,18 @@
 #include <getopt.h>
 #include <stdlib.h>
 #include <signal.h>
+#include <string.h>
 
 #include <waiter/waiter.h>
 #include <log/log.h>
+#include <process/process.h>
+#include <talloc/talloc.h>
+#include <i18n/i18n.h>
 
-#include "udev.h"
-#include "user-event.h"
 #include "discover-server.h"
 #include "device-handler.h"
+#include "sysinfo.h"
+#include "platform.h"
 
 static void print_version(void)
 {
@@ -25,7 +29,8 @@ static void print_usage(void)
 {
        print_version();
        printf(
-"Usage: pb-discover [-h, --help] [-l, --log log-file] [-V, --version]\n");
+"Usage: pb-discover [-a, --no-autoboot] [-h, --help] [-l, --log log-file]\n"
+"                   [-n, --dry-run] [-v, --verbose] [-V, --version]\n");
 }
 
 /**
@@ -39,9 +44,12 @@ enum opt_value {opt_undef = 0, opt_yes, opt_no};
  */
 
 struct opts {
+       enum opt_value no_autoboot;
        enum opt_value show_help;
        const char *log_file;
+       enum opt_value dry_run;
        enum opt_value show_version;
+       enum opt_value verbose;
 };
 
 /**
@@ -51,14 +59,20 @@ struct opts {
 static int opts_parse(struct opts *opts, int argc, char *argv[])
 {
        static const struct option long_options[] = {
+               {"no-autoboot",    no_argument,       NULL, 'a'},
                {"help",           no_argument,       NULL, 'h'},
                {"log",            required_argument, NULL, 'l'},
+               {"dry-run",        no_argument,       NULL, 'n'},
+               {"verbose",        no_argument,       NULL, 'v'},
                {"version",        no_argument,       NULL, 'V'},
                { NULL, 0, NULL, 0},
        };
-       static const char short_options[] = "hl:V";
+       static const char short_options[] = "ahl:nvV";
        static const struct opts default_values = {
-               .log_file = "pb-discover.log",
+               .no_autoboot = opt_no,
+               .log_file = "/var/log/petitboot/pb-discover.log",
+               .dry_run = opt_no,
+               .verbose = opt_no,
        };
 
        *opts = default_values;
@@ -71,12 +85,21 @@ static int opts_parse(struct opts *opts, int argc, char *argv[])
                        break;
 
                switch (c) {
+               case 'a':
+                       opts->no_autoboot = opt_yes;
+                       break;
                case 'h':
                        opts->show_help = opt_yes;
                        break;
                case 'l':
                        opts->log_file = optarg;
                        break;
+               case 'n':
+                       opts->dry_run = opt_yes;
+                       break;
+               case 'v':
+                       opts->verbose = opt_yes;
+                       break;
                case 'V':
                        opts->show_version = opt_yes;
                        break;
@@ -100,11 +123,15 @@ int main(int argc, char *argv[])
 {
        struct device_handler *handler;
        struct discover_server *server;
+       struct waitset *waitset;
+       struct procset *procset;
        struct opts opts;
-       struct udev *udev;
-       struct user_event *uev;
        FILE *log;
 
+       setlocale(LC_ALL, "");
+       bindtextdomain(PACKAGE, LOCALEDIR);
+       textdomain(PACKAGE);
+
        if (opts_parse(&opts, argc, argv)) {
                print_usage();
                return EXIT_FAILURE;
@@ -120,13 +147,20 @@ int main(int argc, char *argv[])
                return EXIT_SUCCESS;
        }
 
-       log = fopen(opts.log_file, "a");
-       assert(log);
-       pb_log_set_stream(log);
+       log = stderr;
+       if (strcmp(opts.log_file, "-")) {
+               log = fopen(opts.log_file, "a");
+               if (!log) {
+                       fprintf(stderr, "can't open log file %s, logging to "
+                                       "stderr\n", opts.log_file);
+                       log = stderr;
+               }
+       }
+       pb_log_init(log);
+
+       if (opts.verbose == opt_yes)
+               pb_log_set_debug(true);
 
-#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 */
@@ -134,35 +168,48 @@ int main(int argc, char *argv[])
 
        signal(SIGINT, sigint_handler);
 
-       server = discover_server_init();
+       waitset = waitset_create(NULL);
+
+       server = discover_server_init(waitset);
        if (!server)
                return EXIT_FAILURE;
 
-       handler = device_handler_init(server);
-       if (!handler)
+       procset = process_init(server, waitset, opts.dry_run == opt_yes);
+       if (!procset)
                return EXIT_FAILURE;
 
-       discover_server_set_device_source(server, handler);
+       platform_init(NULL);
+       if (opts.no_autoboot == opt_yes)
+               config_set_autoboot(false);
 
-       udev = udev_init(handler);
-       if (!udev)
-               return EXIT_FAILURE;
+       if (config_get()->lang)
+               setlocale(LC_ALL, config_get()->lang);
+
+       if (config_get()->debug)
+               pb_log_set_debug(true);
 
-       uev = user_event_init(handler);
-       if (!uev)
+       system_info_init(server);
+
+       handler = device_handler_init(server, waitset, opts.dry_run == opt_yes);
+       if (!handler)
                return EXIT_FAILURE;
 
-       udev_trigger(udev);
-       user_event_trigger(uev);
+       discover_server_set_device_source(server, handler);
 
        for (running = 1; running;) {
-               if (waiter_poll())
+               if (waiter_poll(waitset))
                        break;
        }
 
        device_handler_destroy(handler);
+       discover_server_destroy(server);
+       platform_fini();
+       talloc_free(waitset);
 
        pb_log("--- end ---\n");
 
+       if (log != stderr)
+               fclose(log);
+
        return EXIT_SUCCESS;
 }