diff options
| author | Michal Schmidt <mschmidt@redhat.com> | 2011-11-10 09:55:47 +0100 |
|---|---|---|
| committer | Michal Schmidt <mschmidt@redhat.com> | 2011-11-10 10:18:08 +0100 |
| commit | c5419d4239ceb4c3bd0263a0a810cf24a072b3c0 (patch) | |
| tree | 75ea028193e57d631f548f2c5fac88df7c0b7fb2 | |
| parent | 42c3673e632bac0217d1892f45fe5daf767999e1 (diff) | |
service: don't warn if the pidfile still exists after SIGCHLD
A service that drops its privileges may not be able to remove it when it
exits. The stale pidfile is not a problem as long as the service
carefully recognizes it on its next start.
systemd would produce a warning after the service exits:
PID ... read from file ... does not exist. Your service or init
script might be broken.
Silence the warning in this case. Still warn if this error is detected
when loading the pidfile after service start.
Noticed by Miroslav Lichvar in
https://bugzilla.redhat.com/show_bug.cgi?id=752396
| -rw-r--r-- | src/service.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/service.c b/src/service.c index eb475d9cc9..6fc2484f13 100644 --- a/src/service.c +++ b/src/service.c @@ -1290,7 +1290,7 @@ static void service_dump(Unit *u, FILE *f, const char *prefix) { free(p2); } -static int service_load_pid_file(Service *s, bool warn_if_missing) { +static int service_load_pid_file(Service *s, bool may_warn) { char *k; int r; pid_t pid; @@ -1301,7 +1301,7 @@ static int service_load_pid_file(Service *s, bool warn_if_missing) { return -ENOENT; if ((r = read_one_line_file(s->pid_file, &k)) < 0) { - if (warn_if_missing) + if (may_warn) log_warning("Failed to read PID file %s after %s. The service might be broken.", s->pid_file, service_state_to_string(s->state)); return r; @@ -1314,8 +1314,9 @@ static int service_load_pid_file(Service *s, bool warn_if_missing) { return r; if (kill(pid, 0) < 0 && errno != EPERM) { - log_warning("PID %lu read from file %s does not exist. Your service or init script might be broken.", - (unsigned long) pid, s->pid_file); + if (may_warn) + log_warning("PID %lu read from file %s does not exist. Your service or init script might be broken.", + (unsigned long) pid, s->pid_file); return -ESRCH; } |