shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-24 21:34:08 +03:00
Code

service: minor modernization

Browse Source
This commit is contained in:
Lennart Poettering 2014-07-07 17:03:34 +02:00
parent 4774e35726
commit 5e56b378b4
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/service.c
View File

@ -2575,7 +2575,6 @@ static void service_notify_message(Unit *u, pid_t pid, char **tags) {
} }
if (s->notify_access == NOTIFY_MAIN && pid != s->main_pid) { if (s->notify_access == NOTIFY_MAIN && pid != s->main_pid) {
if (s->main_pid != 0) if (s->main_pid != 0)
log_warning_unit(u->id, "%s: Got notification message from PID "PID_FMT", but reception only permitted for main PID "PID_FMT, u->id, pid, s->main_pid); log_warning_unit(u->id, "%s: Got notification message from PID "PID_FMT", but reception only permitted for main PID "PID_FMT, u->id, pid, s->main_pid);
else else
@ -2584,14 +2583,10 @@ static void service_notify_message(Unit *u, pid_t pid, char **tags) {
} }
/* Interpret MAINPID= */ /* Interpret MAINPID= */
if ((e = strv_find_prefix(tags, "MAINPID=")) && e = strv_find_prefix(tags, "MAINPID=");
(s->state == SERVICE_START || if (e && IN_SET(s->state, SERVICE_START, SERVICE_START_POST, SERVICE_RUNNING, SERVICE_RELOAD)) {
s->state == SERVICE_START_POST ||
s->state == SERVICE_RUNNING ||
s->state == SERVICE_RELOAD)) {
if (parse_pid(e + 8, &pid) < 0) if (parse_pid(e + 8, &pid) < 0)
log_warning_unit(u->id, "Failed to parse notification message %s", e); log_warning_unit(u->id, "Failed to parse MAINPID= field in notification message: %s", e);
else { else {
log_debug_unit(u->id, "%s: got %s", u->id, e); log_debug_unit(u->id, "%s: got %s", u->id, e);
service_set_main_pid(s, pid); service_set_main_pid(s, pid);