X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=main.c;h=624a73e1783c9e2fbebef353db35dc107c5cc6a6;hb=c9b97d2a838899d00004fbfbd3f8c2e6932c89a0;hp=f42710b64bdc75e2425bff9094dbc11d6e5c23ab;hpb=7fad411cb551c3c1cbe801a3991e7a6966e462b5;p=elogind.git

diff --git a/main.c b/main.c
index f42710b64..624a73e17 100644
--- a/main.c
+++ b/main.c
@@ -3,55 +3,52 @@
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "manager.h"
+#include "log.h"
 
 int main(int argc, char *argv[]) {
         Manager *m = NULL;
-        Name *milestone = NULL, *syslog = NULL;
+        Unit *target = NULL;
         Job *job = NULL;
         int r, retval = 1;
 
-        if (!(m = manager_new()) < 0) {
-                fprintf(stderr, "Failed to allocate manager object: %s\n", strerror(ENOMEM));
-                goto finish;
-        }
-
+        assert_se(set_unit_path("test1") >= 0);
 
-        if ((r = manager_load_name(m, "default.milestone", &milestone)) < 0) {
-                fprintf(stderr, "Failed to load default milestone: %s\n", strerror(-r));
+        if (!(m = manager_new()) < 0) {
+                log_error("Failed to allocate manager object: %s", strerror(ENOMEM));
                 goto finish;
         }
 
-        if ((r = manager_load_name(m, "syslog.socket", &syslog)) < 0) {
-                fprintf(stderr, "Failed to load syslog socket: %s\n", 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_add_job(m, JOB_START, milestone, JOB_REPLACE, false, &job)) < 0) {
-                fprintf(stderr, "Failed to start default milestone: %s\n", 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 units:\n");
+        manager_dump_units(m, stdout, "\t");
 
-        printf("- By jobs:\n");
+        printf("→ By jobs:\n");
         manager_dump_jobs(m, stdout, "\t");
 
-        if ((r = manager_add_job(m, JOB_STOP, syslog, JOB_REPLACE, false, &job)) < 0) {
-                fprintf(stderr, "Failed to start default milestone: %s\n", strerror(-r));
+        if ((r = manager_loop(m)) < 0) {
+                log_error("Failed to run mainloop: %s", strerror(-r));
                 goto finish;
         }
 
-        printf("- By jobs:\n");
-        manager_dump_jobs(m, stdout, "\t");
-
         retval = 0;
 
 finish:
         if (m)
                 manager_free(m);
 
+        log_debug("Exit.");
+
         return retval;
 }