summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TODO6
-rw-r--r--src/manager.c16
2 files changed, 12 insertions, 10 deletions
diff --git a/TODO b/TODO
index f3c9b4057b..f4aacacfb5 100644
--- a/TODO
+++ b/TODO
@@ -21,13 +21,13 @@ F15:
* fix alsa mixer restore to not print error when no config is stored
-* don't trim empty cgroups
- https://bugzilla.redhat.com/show_bug.cgi?id=678555
-
* disable most systemctl verbs in chroot()s
Features:
+* don't trim empty cgroups
+ https://bugzilla.redhat.com/show_bug.cgi?id=678555
+
* write blog stories about:
- chroot, nspawn and friends
- the blame game: systemd-analyze
diff --git a/src/manager.c b/src/manager.c
index 9fc854b661..6ddd40e873 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -2059,8 +2059,6 @@ static int manager_process_signal_fd(Manager *m) {
assert(m);
for (;;) {
- char *p = NULL;
-
if ((n = read(m->signal_watch.fd, &sfsi, sizeof(sfsi))) != sizeof(sfsi)) {
if (n >= 0)
@@ -2072,13 +2070,17 @@ static int manager_process_signal_fd(Manager *m) {
return -errno;
}
- if (sfsi.ssi_pid > 0)
+ if (sfsi.ssi_pid > 0) {
+ char *p = NULL;
+
get_process_name(sfsi.ssi_pid, &p);
- log_debug("Received SIG%s from PID %lu (%s)",
- strna(signal_to_string(sfsi.ssi_signo)),
- (unsigned long) sfsi.ssi_pid, strna(p));
- free(p);
+ log_debug("Received SIG%s from PID %lu (%s).",
+ strna(signal_to_string(sfsi.ssi_signo)),
+ (unsigned long) sfsi.ssi_pid, strna(p));
+ free(p);
+ } else
+ log_debug("Received SIG%s.", strna(signal_to_string(sfsi.ssi_signo)));
switch (sfsi.ssi_signo) {