chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
manager: introduce watch_init() initializer for watches
[elogind.git]
/
src
/
core
/
unit.c
diff --git
a/src/core/unit.c
b/src/core/unit.c
index ae43545c6fd00e91109712c258778d9e1c656fe8..82dd617e35175cba8a3d71adb795932d4a8db647 100644
(file)
--- a/
src/core/unit.c
+++ b/
src/core/unit.c
@@
-1023,7
+1023,7
@@
static void unit_status_log_starting_stopping_reloading(Unit *u, JobType t) {
SD_MESSAGE_UNIT_RELOADING;
log_struct(LOG_INFO,
SD_MESSAGE_UNIT_RELOADING;
log_struct(LOG_INFO,
-
"MESSAGE_ID=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL
(mid),
+
MESSAGE_ID
(mid),
"UNIT=%s", u->id,
"MESSAGE=%s", buf,
NULL);
"UNIT=%s", u->id,
"MESSAGE=%s", buf,
NULL);
@@
-1438,7
+1438,10
@@
void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su
check_unneeded_dependencies(u);
if (ns != os && ns == UNIT_FAILED) {
check_unneeded_dependencies(u);
if (ns != os && ns == UNIT_FAILED) {
- log_notice("Unit %s entered failed state.", u->id);
+ log_struct(LOG_NOTICE,
+ "MESSAGE=Unit %s entered failed state", u->id,
+ "UNIT=%s", u->id,
+ NULL);
unit_trigger_on_failure(u);
}
}
unit_trigger_on_failure(u);
}
}
@@
-1577,7
+1580,8
@@
int unit_watch_timer(Unit *u, usec_t delay, Watch *w) {
} else if (w->type == WATCH_INVALID) {
ours = true;
} else if (w->type == WATCH_INVALID) {
ours = true;
- if ((fd = timerfd_create(CLOCK_MONOTONIC, TFD_NONBLOCK|TFD_CLOEXEC)) < 0)
+ fd = timerfd_create(CLOCK_MONOTONIC, TFD_NONBLOCK|TFD_CLOEXEC);
+ if (fd < 0)
return -errno;
} else
assert_not_reached("Invalid watch type");
return -errno;
} else
assert_not_reached("Invalid watch type");