manager: don't show PID for incoming signals if it is 0

This commit is contained in:
Lennart Poettering 2011-04-06 01:33:34 +02:00
parent 100fd5676c
commit 67370238b5
2 changed files with 12 additions and 10 deletions

6
TODO
View File

@ -21,13 +21,13 @@ F15:
* fix alsa mixer restore to not print error when no config is stored * 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 * disable most systemctl verbs in chroot()s
Features: Features:
* don't trim empty cgroups
https://bugzilla.redhat.com/show_bug.cgi?id=678555
* write blog stories about: * write blog stories about:
- chroot, nspawn and friends - chroot, nspawn and friends
- the blame game: systemd-analyze - the blame game: systemd-analyze

View File

@ -2059,8 +2059,6 @@ static int manager_process_signal_fd(Manager *m) {
assert(m); assert(m);
for (;;) { for (;;) {
char *p = NULL;
if ((n = read(m->signal_watch.fd, &sfsi, sizeof(sfsi))) != sizeof(sfsi)) { if ((n = read(m->signal_watch.fd, &sfsi, sizeof(sfsi))) != sizeof(sfsi)) {
if (n >= 0) if (n >= 0)
@ -2072,13 +2070,17 @@ static int manager_process_signal_fd(Manager *m) {
return -errno; return -errno;
} }
if (sfsi.ssi_pid > 0) if (sfsi.ssi_pid > 0) {
char *p = NULL;
get_process_name(sfsi.ssi_pid, &p); get_process_name(sfsi.ssi_pid, &p);
log_debug("Received SIG%s from PID %lu (%s)", log_debug("Received SIG%s from PID %lu (%s).",
strna(signal_to_string(sfsi.ssi_signo)), strna(signal_to_string(sfsi.ssi_signo)),
(unsigned long) sfsi.ssi_pid, strna(p)); (unsigned long) sfsi.ssi_pid, strna(p));
free(p); free(p);
} else
log_debug("Received SIG%s.", strna(signal_to_string(sfsi.ssi_signo)));
switch (sfsi.ssi_signo) { switch (sfsi.ssi_signo) {