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

diff --git a/main.c b/main.c
index f42710b64..f073c8f28 100644
--- a/main.c
+++ b/main.c
@@ -3,8 +3,10 @@
 #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;
@@ -12,24 +14,25 @@ int main(int argc, char *argv[]) {
         Job *job = NULL;
         int r, retval = 1;
 
+        assert_se(chdir("test1") == 0);
+
         if (!(m = manager_new()) < 0) {
-                fprintf(stderr, "Failed to allocate manager object: %s\n", strerror(ENOMEM));
+                log_error("Failed to allocate manager object: %s", strerror(ENOMEM));
                 goto finish;
         }
 
-
         if ((r = manager_load_name(m, "default.milestone", &milestone)) < 0) {
-                fprintf(stderr, "Failed to load default milestone: %s\n", strerror(-r));
+                log_error("Failed to load default milestone: %s", strerror(-r));
                 goto finish;
         }
 
         if ((r = manager_load_name(m, "syslog.socket", &syslog)) < 0) {
-                fprintf(stderr, "Failed to load syslog socket: %s\n", strerror(-r));
+                log_error("Failed to load syslog socket: %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));
+                log_error("Failed to start default milestone: %s", strerror(-r));
                 goto finish;
         }
 
@@ -39,13 +42,7 @@ int main(int argc, char *argv[]) {
         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));
-                goto finish;
-        }
-
-        printf("- By jobs:\n");
-        manager_dump_jobs(m, stdout, "\t");
+        manager_run_jobs(m);
 
         retval = 0;