chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
first attempt at proper service/socket logic
[elogind.git]
/
main.c
diff --git
a/main.c
b/main.c
index f42710b64bdc75e2425bff9094dbc11d6e5c23ab..a7738f01717df15d965f39de626d23841973a3ea 100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-3,8
+3,10
@@
#include <stdio.h>
#include <errno.h>
#include <string.h>
#include <stdio.h>
#include <errno.h>
#include <string.h>
+#include <unistd.h>
#include "manager.h"
#include "manager.h"
+#include "log.h"
int main(int argc, char *argv[]) {
Manager *m = NULL;
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;
Job *job = NULL;
int r, retval = 1;
+ assert_se(chdir("test1") == 0);
+
if (!(m = manager_new()) < 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;
}
goto finish;
}
-
if ((r = manager_load_name(m, "default.milestone", &milestone)) < 0) {
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) {
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) {
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;
}
goto finish;
}
@@
-39,13
+42,7
@@
int main(int argc, char *argv[]) {
printf("- By jobs:\n");
manager_dump_jobs(m, stdout, "\t");
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_loop(m);
retval = 0;
retval = 0;