chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
improve dump output for sockets
[elogind.git]
/
main.c
diff --git
a/main.c
b/main.c
index fde11c094b2754467ceb2069a34e71d55e40d7ea..052d5029cc9ed5b3ce7334935792a43699eb34b7 100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-3,49
+3,41
@@
#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;
-
Name *milestone = NULL, *syslog
= NULL;
+
Unit *target
= NULL;
Job *job = NULL;
int r, retval = 1;
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;
}
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;
}
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;
}
goto finish;
}
- printf("
- By name
s:\n");
- manager_dump_
name
s(m, stdout, "\t");
+ printf("
→ By unit
s:\n");
+ manager_dump_
unit
s(m, stdout, "\t");
- printf("
-
By jobs:\n");
+ printf("
→
By jobs:\n");
manager_dump_jobs(m, stdout, "\t");
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;