rework config file load logic

[elogind.git] / main.c

diff --git a/main.c b/main.c
index e10c57b4457a113fd985b8d6c193ca5a50fec3f1..2486f06292144d4e4ea941c18cf826e731bcc701 100644 (file)
--- a/main.c
+++ b/main.c
@@ -10,39 +10,37 @@
 
 int main(int argc, char *argv[]) {
         Manager *m = NULL;
-        Name *milestone = NULL, *syslog = NULL;
+        Unit *target = NULL;
         Job *job = NULL;
         int r, retval = 1;
 
-        assert_se(chdir("test1") == 0);
+        assert_se(set_unit_path("test1") >= 0);
 
         if (!(m = manager_new()) < 0) {
                 log_error("Failed to allocate manager object: %s", strerror(ENOMEM));
                 goto finish;
         }
 
-        if ((r = manager_load_name(m, "default.milestone", &milestone)) < 0) {
-                log_error("Failed to load default milestone: %s", strerror(-r));
+        if ((r = manager_load_unit(m, "default.target", &target)) < 0) {
+                log_error("Failed to load default target: %s", strerror(-r));
                 goto finish;
         }
 
-        if ((r = manager_load_name(m, "syslog.socket", &syslog)) < 0) {
-                log_error("Failed to load syslog socket: %s", strerror(-r));
-                goto finish;
-        }
+        printf("→ By units:\n");
+        manager_dump_units(m, stdout, "\t");
 
-        if ((r = manager_add_job(m, JOB_START, milestone, JOB_REPLACE, false, &job)) < 0) {
-                log_error("Failed to start default milestone: %s", strerror(-r));
+        if ((r = manager_add_job(m, JOB_START, target, JOB_REPLACE, false, &job)) < 0) {
+                log_error("Failed to start default target: %s", strerror(-r));
                 goto finish;
         }
 
-        printf("→ By names:\n");
-        manager_dump_names(m, stdout, "\t");
-
         printf("→ By jobs:\n");
         manager_dump_jobs(m, stdout, "\t");
 
-        /* manager_loop(m); */
+        if ((r = manager_loop(m)) < 0) {
+                log_error("Failed to run mainloop: %s", strerror(-r));
+                goto finish;
+        }
 
         retval = 0;
 
@@ -50,5 +48,7 @@ finish:
         if (m)
                 manager_free(m);
 
+        log_debug("Exit.");
+
         return retval;
 }