summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-06-25 12:15:07 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-07-17 23:41:10 -0400
commit4b744dfabebd10bf0f13b64060f44b1bd6c82704 (patch)
tree0f7f24600bdd026c439b6b36b62c2a0684ad5832
parentd121b396ccb19dc33aacfc75a7f7a719914267c8 (diff)
systemd: log failed conditions
ConditionPathExists=/tmp/nosuchpath failed for nosuchpath.service.
-rw-r--r--src/core/condition.c12
-rw-r--r--src/core/condition.h2
-rw-r--r--src/core/unit.c2
3 files changed, 13 insertions, 3 deletions
diff --git a/src/core/condition.c b/src/core/condition.c
index 427aa080ad..2fbc5ad0e6 100644
--- a/src/core/condition.c
+++ b/src/core/condition.c
@@ -37,6 +37,7 @@
#include "virt.h"
#include "path-util.h"
#include "fileio.h"
+#include "unit.h"
Condition* condition_new(ConditionType type, const char *parameter, bool trigger, bool negate) {
Condition *c;
@@ -333,7 +334,7 @@ bool condition_test(Condition *c) {
}
}
-bool condition_test_list(Condition *first) {
+bool condition_test_list(const char *unit, Condition *first) {
Condition *c;
int triggered = -1;
@@ -348,6 +349,15 @@ bool condition_test_list(Condition *first) {
bool b;
b = condition_test(c);
+ if (unit)
+ log_debug_unit(unit,
+ "%s=%s%s%s %s for %s.",
+ condition_type_to_string(c->type),
+ c->trigger ? "|" : "",
+ c->negate ? "!" : "",
+ c->parameter,
+ b ? "succeeded" : "failed",
+ unit);
if (!c->trigger && !b)
return false;
diff --git a/src/core/condition.h b/src/core/condition.h
index 50ed955af9..2ad77876e4 100644
--- a/src/core/condition.h
+++ b/src/core/condition.h
@@ -61,7 +61,7 @@ void condition_free(Condition *c);
void condition_free_list(Condition *c);
bool condition_test(Condition *c);
-bool condition_test_list(Condition *c);
+bool condition_test_list(const char *unit, Condition *c);
void condition_dump(Condition *c, FILE *f, const char *prefix);
void condition_dump_list(Condition *c, FILE *f, const char *prefix);
diff --git a/src/core/unit.c b/src/core/unit.c
index f4f92f0fca..a201fa4041 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -996,7 +996,7 @@ bool unit_condition_test(Unit *u) {
assert(u);
dual_timestamp_get(&u->condition_timestamp);
- u->condition_result = condition_test_list(u->conditions);
+ u->condition_result = condition_test_list(u->id, u->conditions);
return u->condition_result;
}