summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-01-20 04:02:39 +0100
committerLennart Poettering <lennart@poettering.net>2010-01-20 04:02:39 +0100
commitcea8e32e3fc57569094e2ddf4167f2a9864fc3a4 (patch)
treec66112ed090cf151d9dd867e2aa32e87fcd504a6
parentceed357001a7543c62468c5b943cf80c2a644252 (diff)
extend test a little
-rw-r--r--main.c20
-rw-r--r--manager.c8
-rw-r--r--manager.h4
3 files changed, 24 insertions, 8 deletions
diff --git a/main.c b/main.c
index de7572efa8..fde11c094b 100644
--- a/main.c
+++ b/main.c
@@ -8,7 +8,7 @@
int main(int argc, char *argv[]) {
Manager *m = NULL;
- Name *milestone = NULL;
+ Name *milestone = NULL, *syslog = NULL;
Job *job = NULL;
int r, retval = 1;
@@ -23,13 +23,29 @@ int main(int argc, char *argv[]) {
goto finish;
}
+ if ((r = manager_load_name(m, "syslog.socket", &syslog) < 0)) {
+ fprintf(stderr, "Failed to load syslog socket: %s\n", 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));
goto finish;
}
- manager_dump_names(m, stdout);
+ printf("- By names:\n");
+ manager_dump_names(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");
retval = 0;
diff --git a/manager.c b/manager.c
index 6470e1c1a8..170ea84344 100644
--- a/manager.c
+++ b/manager.c
@@ -778,7 +778,7 @@ finish:
return 0;
}
-void manager_dump_jobs(Manager *s, FILE *f) {
+void manager_dump_jobs(Manager *s, FILE *f, const char *prefix) {
void *state;
Job *j;
@@ -786,10 +786,10 @@ void manager_dump_jobs(Manager *s, FILE *f) {
assert(f);
HASHMAP_FOREACH(j, s->jobs, state)
- job_dump(j, f, NULL);
+ job_dump(j, f, prefix);
}
-void manager_dump_names(Manager *s, FILE *f) {
+void manager_dump_names(Manager *s, FILE *f, const char *prefix) {
void *state;
Name *n;
const char *t;
@@ -799,5 +799,5 @@ void manager_dump_names(Manager *s, FILE *f) {
HASHMAP_FOREACH_KEY(n, t, s->names, state)
if (name_id(n) == t)
- name_dump(n, f, NULL);
+ name_dump(n, f, prefix);
}
diff --git a/manager.h b/manager.h
index ad62b74a74..e68b087fd4 100644
--- a/manager.h
+++ b/manager.h
@@ -45,8 +45,8 @@ Name *manager_get_name(Manager *m, const char *name);
int manager_load_name(Manager *m, const char *name, Name **_ret);
int manager_add_job(Manager *m, JobType type, Name *name, JobMode mode, bool force, Job **_ret);
-void manager_dump_names(Manager *s, FILE *f);
-void manager_dump_jobs(Manager *s, FILE *f);
+void manager_dump_names(Manager *s, FILE *f, const char *prefix);
+void manager_dump_jobs(Manager *s, FILE *f, const char *prefix);
void manager_transaction_delete_job(Manager *m, Job *j);