X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fservice.c;h=fabb71ca978f23453aac4c4bec7cad1db28a7643;hp=f8b4ff6a246d5c9c5044d2be243513f81f8fa191;hb=28708d8aa0da5ac1c568b08b1e1c951f69cd4e82;hpb=b708e7cea941538bfd5e20ce0a723c19b7da7d1d diff --git a/src/service.c b/src/service.c index f8b4ff6a2..fabb71ca9 100644 --- a/src/service.c +++ b/src/service.c @@ -1,4 +1,4 @@ -/*-*- Mode: C; c-basic-offset: 8 -*-*/ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ /*** This file is part of systemd. @@ -49,20 +49,32 @@ static const struct { const char *target; const RunlevelType type; } rcnd_table[] = { - /* Standard SysV runlevels */ - { "rc0.d", SPECIAL_POWEROFF_TARGET, RUNLEVEL_DOWN }, + /* Standard SysV runlevels for start-up */ { "rc1.d", SPECIAL_RESCUE_TARGET, RUNLEVEL_UP }, { "rc2.d", SPECIAL_RUNLEVEL2_TARGET, RUNLEVEL_UP }, { "rc3.d", SPECIAL_RUNLEVEL3_TARGET, RUNLEVEL_UP }, { "rc4.d", SPECIAL_RUNLEVEL4_TARGET, RUNLEVEL_UP }, { "rc5.d", SPECIAL_RUNLEVEL5_TARGET, RUNLEVEL_UP }, - { "rc6.d", SPECIAL_REBOOT_TARGET, RUNLEVEL_DOWN }, +#ifdef TARGET_SUSE /* SUSE style boot.d */ { "boot.d", SPECIAL_SYSINIT_TARGET, RUNLEVEL_SYSINIT }, +#endif +#ifdef TARGET_DEBIAN /* Debian style rcS.d */ { "rcS.d", SPECIAL_SYSINIT_TARGET, RUNLEVEL_SYSINIT }, +#endif + + /* Standard SysV runlevels for shutdown */ + { "rc0.d", SPECIAL_POWEROFF_TARGET, RUNLEVEL_DOWN }, + { "rc6.d", SPECIAL_REBOOT_TARGET, RUNLEVEL_DOWN } + + /* Note that the order here matters, as we read the + directories in this order, and we want to make sure that + sysv_start_priority is known when we first load the + unit. And that value we only know from S links. Hence + UP/SYSINIT must be read before DOWN */ }; #define RUNLEVELS_UP "12345" @@ -83,7 +95,7 @@ static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = { [SERVICE_STOP_POST] = UNIT_DEACTIVATING, [SERVICE_FINAL_SIGTERM] = UNIT_DEACTIVATING, [SERVICE_FINAL_SIGKILL] = UNIT_DEACTIVATING, - [SERVICE_MAINTENANCE] = UNIT_MAINTENANCE, + [SERVICE_FAILED] = UNIT_FAILED, [SERVICE_AUTO_RESTART] = UNIT_ACTIVATING }; @@ -239,9 +251,17 @@ static int sysv_translate_facility(const char *name, char **_r) { "$time", SPECIAL_RTC_SET_TARGET, /* Debian extensions */ +#ifdef TARGET_DEBIAN "$mail-transport-agent", SPECIAL_MAIL_TRANSFER_AGENT_TARGET, +#endif "$mail-transfer-agent", SPECIAL_MAIL_TRANSFER_AGENT_TARGET, - "$x-display-manager", SPECIAL_DISPLAY_MANAGER_SERVICE + "$x-display-manager", SPECIAL_DISPLAY_MANAGER_SERVICE, + +#ifdef TARGET_FEDORA + /* Fedora extensions, lacking the $ prefix */ + "MTA", SPECIAL_MAIL_TRANSFER_AGENT_TARGET, + "smtpdaemon", SPECIAL_MAIL_TRANSFER_AGENT_TARGET +#endif }; unsigned i; @@ -284,6 +304,7 @@ static int sysv_fix_order(Service *s) { LIST_FOREACH(units_per_type, other, s->meta.manager->units_per_type[UNIT_SERVICE]) { Service *t; UnitDependency d; + bool special_s, special_t; t = (Service*) other; @@ -299,7 +320,14 @@ static int sysv_fix_order(Service *s) { (!t->sysv_path || t->sysv_has_lsb)) continue; - if (t->sysv_start_priority < s->sysv_start_priority) + special_s = s->sysv_runlevels && !chars_intersect(RUNLEVELS_UP, s->sysv_runlevels); + special_t = t->sysv_runlevels && !chars_intersect(RUNLEVELS_UP, t->sysv_runlevels); + + if (special_t && !special_s) + d = UNIT_AFTER; + else if (special_s && !special_t) + d = UNIT_BEFORE; + else if (t->sysv_start_priority < s->sysv_start_priority) d = UNIT_AFTER; else if (t->sysv_start_priority > s->sysv_start_priority) d = UNIT_BEFORE; @@ -468,7 +496,7 @@ static int service_load_sysv_path(Service *s, const char *path) { t[k-1] = 0; } - if (!(d = strdup(strstrip(t+12)))) { + if (!(d = strappend("LSB: ", strstrip(t+12)))) { r = -ENOMEM; goto finish; } @@ -546,13 +574,15 @@ static int service_load_sysv_path(Service *s, const char *path) { if (unit_name_to_type(m) == UNIT_SERVICE) r = unit_add_name(u, m); + else if (s->sysv_enabled) + r = unit_add_two_dependencies_by_name_inverse(u, UNIT_AFTER, UNIT_WANTS, m, NULL, true); else - r = unit_add_two_dependencies_by_name_inverse(u, UNIT_AFTER, UNIT_REQUIRES, m, NULL, true); - - free(m); + r = unit_add_dependency_by_name_inverse(u, UNIT_AFTER, m, NULL, true); if (r < 0) - goto finish; + log_error("[%s:%u] Failed to add LSB Provides name %s, ignoring: %s", path, line, m, strerror(-r)); + + free(m); } } else if (startswith_no_case(t, "Required-Start:") || @@ -582,10 +612,11 @@ static int service_load_sysv_path(Service *s, const char *path) { continue; r = unit_add_dependency_by_name(u, startswith_no_case(t, "X-Start-Before:") ? UNIT_BEFORE : UNIT_AFTER, m, NULL, true); - free(m); if (r < 0) - goto finish; + log_error("[%s:%u] Failed to add dependency on %s, ignoring: %s", path, line, m, strerror(-r)); + + free(m); } } else if (startswith_no_case(t, "Default-Start:")) { char *k, *d; @@ -613,7 +644,7 @@ static int service_load_sysv_path(Service *s, const char *path) { state = LSB_DESCRIPTION; - if (!(d = strdup(strstrip(t+12)))) { + if (!(d = strappend("LSB: ", strstrip(t+12)))) { r = -ENOMEM; goto finish; } @@ -626,7 +657,7 @@ static int service_load_sysv_path(Service *s, const char *path) { state = LSB; - if (!(d = strdup(strstrip(t+18)))) { + if (!(d = strappend("LSB: ", strstrip(t+18)))) { r = -ENOMEM; goto finish; } @@ -684,9 +715,11 @@ static int service_load_sysv_path(Service *s, const char *path) { /* Special setting for all SysV services */ s->type = SERVICE_FORKING; - s->valid_no_process = true; + s->remain_after_exit = true; s->restart = SERVICE_ONCE; - s->exec_context.std_output = EXEC_OUTPUT_TTY; + s->exec_context.std_output = + (s->meta.manager->sysv_console || s->exec_context.std_input == EXEC_INPUT_TTY) + ? EXEC_OUTPUT_TTY : EXEC_OUTPUT_NULL; s->exec_context.kill_mode = KILL_PROCESS_GROUP; u->meta.load_state = UNIT_LOADED; @@ -775,7 +808,7 @@ static int service_load_sysv(Service *s) { if (t == s->meta.id) continue; - if ((r == service_load_sysv_name(s, t)) < 0) + if ((r = service_load_sysv_name(s, t)) < 0) return r; if (s->meta.load_state != UNIT_STUB) @@ -812,8 +845,9 @@ static int service_verify(Service *s) { return -EINVAL; } - if (s->exec_command[SERVICE_EXEC_START]->command_next) { - log_error("%s has more than one ExecStart setting. Refusing.", s->meta.id); + if (s->type != SERVICE_ONESHOT && + s->exec_command[SERVICE_EXEC_START]->command_next) { + log_error("%s has more than one ExecStart setting, which is only allowed for Type=oneshot services. Refusing.", s->meta.id); return -EINVAL; } @@ -851,7 +885,7 @@ static int service_add_default_dependencies(Service *s) { } /* Second, activate normal shutdown */ - return unit_add_two_dependencies_by_name(UNIT(s), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true); + return unit_add_two_dependencies_by_name(UNIT(s), UNIT_BEFORE, UNIT_CONFLICTED_BY, SPECIAL_SHUTDOWN_TARGET, NULL, true); } static int service_load(Unit *u) { @@ -928,14 +962,16 @@ static void service_dump(Unit *u, FILE *f, const char *prefix) { "%sService State: %s\n" "%sPermissionsStartOnly: %s\n" "%sRootDirectoryStartOnly: %s\n" - "%sValidNoProcess: %s\n" + "%sRemainAfterExit: %s\n" "%sType: %s\n" + "%sRestart: %s\n" "%sNotifyAccess: %s\n", prefix, service_state_to_string(s->state), prefix, yes_no(s->permissions_start_only), prefix, yes_no(s->root_directory_start_only), - prefix, yes_no(s->valid_no_process), + prefix, yes_no(s->remain_after_exit), prefix, service_type_to_string(s->type), + prefix, service_restart_to_string(s->restart), prefix, notify_access_to_string(s->notify_access)); if (s->control_pid > 0) @@ -982,8 +1018,10 @@ static void service_dump(Unit *u, FILE *f, const char *prefix) { if (s->sysv_start_priority >= 0) fprintf(f, - "%sSysVStartPriority: %i\n", - prefix, s->sysv_start_priority); + "%sSysVStartPriority: %i\n" + "%sSysVEnabled: %s\n", + prefix, s->sysv_start_priority, + prefix, yes_no(s->sysv_enabled)); if (s->sysv_runlevels) fprintf(f, "%sSysVRunLevels: %s\n", @@ -1159,7 +1197,7 @@ static void service_set_state(Service *s, ServiceState state) { state == SERVICE_STOP_POST || state == SERVICE_FINAL_SIGTERM || state == SERVICE_FINAL_SIGKILL || - state == SERVICE_MAINTENANCE || + state == SERVICE_FAILED || state == SERVICE_AUTO_RESTART) service_notify_sockets_dead(s); @@ -1179,6 +1217,11 @@ static void service_set_state(Service *s, ServiceState state) { service_connection_unref(s); } + /* For the inactive states unit_notify() will trim the cgroup, + * but for exit we have to do that ourselves... */ + if (state == SERVICE_EXITED) + cgroup_bonding_trim_list(s->meta.cgroup_bondings, true); + if (old_state != state) log_debug("%s changed %s -> %s", s->meta.id, service_state_to_string(old_state), service_state_to_string(state)); @@ -1219,7 +1262,7 @@ static int service_coldplug(Unit *u) { if ((s->deserialized_state == SERVICE_START && (s->type == SERVICE_FORKING || s->type == SERVICE_DBUS || - s->type == SERVICE_FINISH || + s->type == SERVICE_ONESHOT || s->type == SERVICE_NOTIFY)) || s->deserialized_state == SERVICE_START_POST || s->deserialized_state == SERVICE_RUNNING || @@ -1469,7 +1512,7 @@ static void service_enter_dead(Service *s, bool success, bool allow_restart) { s->failure = true; if (allow_restart && - s->allow_restart && + !s->forbid_restart && (s->restart == SERVICE_RESTART_ALWAYS || (s->restart == SERVICE_RESTART_ON_SUCCESS && !s->failure))) { @@ -1478,7 +1521,9 @@ static void service_enter_dead(Service *s, bool success, bool allow_restart) { service_set_state(s, SERVICE_AUTO_RESTART); } else - service_set_state(s, s->failure ? SERVICE_MAINTENANCE : SERVICE_DEAD); + service_set_state(s, s->failure ? SERVICE_FAILED : SERVICE_DEAD); + + s->forbid_restart = false; return; @@ -1525,7 +1570,8 @@ fail: static void service_enter_signal(Service *s, ServiceState state, bool success) { int r; - bool sent = false; + Set *pid_set = NULL; + bool wait_for_exit = false; assert(s); @@ -1535,38 +1581,53 @@ static void service_enter_signal(Service *s, ServiceState state, bool success) { if (s->exec_context.kill_mode != KILL_NONE) { int sig = (state == SERVICE_STOP_SIGTERM || state == SERVICE_FINAL_SIGTERM) ? s->exec_context.kill_signal : SIGKILL; - if (s->exec_context.kill_mode == KILL_CONTROL_GROUP) { + if (s->main_pid > 0) { + if (kill(s->exec_context.kill_mode == KILL_PROCESS_GROUP ? + -s->main_pid : + s->main_pid, sig) < 0 && errno != ESRCH) - if ((r = cgroup_bonding_kill_list(s->meta.cgroup_bondings, sig)) < 0) { - if (r != -EAGAIN && r != -ESRCH) - goto fail; - } else - sent = true; + log_warning("Failed to kill main process %li: %m", (long) s->main_pid); + else + wait_for_exit = true; } - if (!sent) { - r = 0; + if (s->control_pid > 0) { + if (kill(s->exec_context.kill_mode == KILL_PROCESS_GROUP ? + -s->control_pid : + s->control_pid, sig) < 0 && errno != ESRCH) - if (s->main_pid > 0) { - if (kill(s->exec_context.kill_mode == KILL_PROCESS ? s->main_pid : -s->main_pid, sig) < 0 && errno != ESRCH) - r = -errno; - else - sent = true; - } + log_warning("Failed to kill control process %li: %m", (long) s->control_pid); + else + wait_for_exit = true; + } - if (s->control_pid > 0) { - if (kill(s->exec_context.kill_mode == KILL_PROCESS ? s->control_pid : -s->control_pid, sig) < 0 && errno != ESRCH) - r = -errno; - else - sent = true; - } + if (s->exec_context.kill_mode == KILL_CONTROL_GROUP) { - if (r < 0) + if (!(pid_set = set_new(trivial_hash_func, trivial_compare_func))) { + r = -ENOMEM; goto fail; + } + + /* Exclude the main/control pids from being killed via the cgroup */ + if (s->main_pid > 0) + if ((r = set_put(pid_set, LONG_TO_PTR(s->main_pid))) < 0) + goto fail; + + if (s->control_pid > 0) + if ((r = set_put(pid_set, LONG_TO_PTR(s->control_pid))) < 0) + goto fail; + + if ((r = cgroup_bonding_kill_list(s->meta.cgroup_bondings, sig, pid_set)) < 0) { + if (r != -EAGAIN && r != -ESRCH && r != -ENOENT) + log_warning("Failed to kill control group: %s", strerror(-r)); + } else if (r > 0) + wait_for_exit = true; + + set_free(pid_set); } } - if (sent && (s->main_pid > 0 || s->control_pid > 0)) { + if (wait_for_exit) { if (s->timeout_usec > 0) if ((r = unit_watch_timer(UNIT(s), s->timeout_usec, &s->timer_watch)) < 0) goto fail; @@ -1586,6 +1647,9 @@ fail: service_enter_stop_post(s, false); else service_enter_dead(s, false, true); + + if (pid_set) + set_free(pid_set); } static void service_enter_stop(Service *s, bool success) { @@ -1635,7 +1699,7 @@ static void service_enter_running(Service *s, bool success) { if ((main_pid_ok > 0 || (main_pid_ok < 0 && cgroup_ok != 0)) && (s->bus_name_good || s->type != SERVICE_DBUS)) service_set_state(s, SERVICE_RUNNING); - else if (s->valid_no_process) + else if (s->remain_after_exit) service_set_state(s, SERVICE_EXITED); else service_enter_stop(s, true); @@ -1678,15 +1742,18 @@ static void service_enter_start(Service *s) { assert(s); assert(s->exec_command[SERVICE_EXEC_START]); - assert(!s->exec_command[SERVICE_EXEC_START]->command_next); + assert(!s->exec_command[SERVICE_EXEC_START]->command_next || s->type == SERVICE_ONESHOT); if (s->type == SERVICE_FORKING) service_unwatch_control_pid(s); else service_unwatch_main_pid(s); + s->control_command_id = SERVICE_EXEC_START; + s->control_command = s->exec_command[SERVICE_EXEC_START]; + if ((r = service_spawn(s, - s->exec_command[SERVICE_EXEC_START], + s->control_command, s->type == SERVICE_FORKING || s->type == SERVICE_DBUS || s->type == SERVICE_NOTIFY, true, true, @@ -1708,17 +1775,14 @@ static void service_enter_start(Service *s) { /* For forking services we wait until the start * process exited. */ - s->control_command_id = SERVICE_EXEC_START; - s->control_command = s->exec_command[SERVICE_EXEC_START]; - s->control_pid = pid; service_set_state(s, SERVICE_START); - } else if (s->type == SERVICE_FINISH || + } else if (s->type == SERVICE_ONESHOT || s->type == SERVICE_DBUS || s->type == SERVICE_NOTIFY) { - /* For finishing services we wait until the start + /* For oneshot services we wait until the start * process exited, too, but it is our main process. */ /* For D-Bus services we know the main pid right away, @@ -1777,7 +1841,7 @@ static void service_enter_restart(Service *s) { service_enter_dead(s, true, false); - if ((r = manager_add_job(s->meta.manager, JOB_START, UNIT(s), JOB_FAIL, false, NULL, NULL)) < 0) + if ((r = manager_add_job(s->meta.manager, JOB_START, UNIT(s), JOB_FAIL, false, &error, NULL)) < 0) goto fail; log_debug("%s scheduled restart job.", s->meta.id); @@ -1821,7 +1885,7 @@ fail: service_enter_stop(s, false); } -static void service_run_next(Service *s, bool success) { +static void service_run_next_control(Service *s, bool success) { int r; assert(s); @@ -1831,8 +1895,9 @@ static void service_run_next(Service *s, bool success) { if (!success) s->failure = true; - s->control_command = s->control_command->command_next; + assert(s->control_command_id != SERVICE_EXEC_START); + s->control_command = s->control_command->command_next; service_unwatch_control_pid(s); if ((r = service_spawn(s, @@ -1841,7 +1906,8 @@ static void service_run_next(Service *s, bool success) { false, !s->permissions_start_only, !s->root_directory_start_only, - false, + s->control_command_id == SERVICE_EXEC_START_PRE || + s->control_command_id == SERVICE_EXEC_STOP_POST, false, &s->control_pid)) < 0) goto fail; @@ -1849,7 +1915,7 @@ static void service_run_next(Service *s, bool success) { return; fail: - log_warning("%s failed to run next task: %s", s->meta.id, strerror(-r)); + log_warning("%s failed to run next control task: %s", s->meta.id, strerror(-r)); if (s->state == SERVICE_START_PRE) service_enter_signal(s, SERVICE_FINAL_SIGTERM, false); @@ -1861,6 +1927,43 @@ fail: service_enter_stop(s, false); } +static void service_run_next_main(Service *s, bool success) { + pid_t pid; + int r; + + assert(s); + assert(s->control_command); + assert(s->control_command->command_next); + + if (!success) + s->failure = true; + + assert(s->control_command_id == SERVICE_EXEC_START); + assert(s->type == SERVICE_ONESHOT); + + s->control_command = s->control_command->command_next; + service_unwatch_main_pid(s); + + if ((r = service_spawn(s, + s->control_command, + false, + true, + true, + true, + true, + s->notify_access != NOTIFY_NONE, + &pid)) < 0) + goto fail; + + service_set_main_pid(s, pid); + + return; + +fail: + log_warning("%s failed to run next main task: %s", s->meta.id, strerror(-r)); + service_enter_stop(s, false); +} + static int service_start(Unit *u) { Service *s = SERVICE(u); @@ -1882,7 +1985,7 @@ static int service_start(Unit *u) { s->state == SERVICE_START_POST) return 0; - assert(s->state == SERVICE_DEAD || s->state == SERVICE_MAINTENANCE || s->state == SERVICE_AUTO_RESTART); + assert(s->state == SERVICE_DEAD || s->state == SERVICE_FAILED || s->state == SERVICE_AUTO_RESTART); /* Make sure we don't enter a busy loop of some kind. */ if (!ratelimit_test(&s->ratelimit)) { @@ -1890,9 +1993,17 @@ static int service_start(Unit *u) { return -ECANCELED; } + if ((s->exec_context.std_input == EXEC_INPUT_SOCKET || + s->exec_context.std_output == EXEC_OUTPUT_SOCKET || + s->exec_context.std_error == EXEC_OUTPUT_SOCKET) && + s->socket_fd < 0) { + log_warning("%s can only be started with a per-connection socket.", u->meta.id); + return -EINVAL; + } + s->failure = false; s->main_pid_known = false; - s->allow_restart = true; + s->forbid_restart = false; service_enter_start_pre(s); return 0; @@ -1905,7 +2016,7 @@ static int service_stop(Unit *u) { /* This is a user request, so don't do restarts on this * shutdown. */ - s->allow_restart = false; + s->forbid_restart = true; /* Already on it */ if (s->state == SERVICE_STOP || @@ -1976,6 +2087,9 @@ static int service_serialize(Unit *u, FILE *f, FDSet *fds) { unit_serialize_item(u, f, "main-pid-known", yes_no(s->main_pid_known)); + if (s->status_text) + unit_serialize_item(u, f, "status-text", s->status_text); + /* There's a minor uncleanliness here: if there are multiple * commands attached here, we will start from the first one * again */ @@ -2018,7 +2132,6 @@ static int service_serialize(Unit *u, FILE *f, FDSet *fds) { static int service_deserialize_item(Unit *u, const char *key, const char *value, FDSet *fds) { Service *s = SERVICE(u); - int r; assert(u); assert(key); @@ -2042,14 +2155,14 @@ static int service_deserialize_item(Unit *u, const char *key, const char *value, } else if (streq(key, "control-pid")) { pid_t pid; - if ((r = parse_pid(value, &pid)) < 0) + if (parse_pid(value, &pid) < 0) log_debug("Failed to parse control-pid value %s", value); else s->control_pid = pid; } else if (streq(key, "main-pid")) { pid_t pid; - if ((r = parse_pid(value, &pid)) < 0) + if (parse_pid(value, &pid) < 0) log_debug("Failed to parse main-pid value %s", value); else service_set_main_pid(s, (pid_t) pid); @@ -2060,6 +2173,14 @@ static int service_deserialize_item(Unit *u, const char *key, const char *value, log_debug("Failed to parse main-pid-known value %s", value); else s->main_pid_known = b; + } else if (streq(key, "status-text")) { + char *t; + + if ((t = strdup(value))) { + free(s->status_text); + s->status_text = t; + } + } else if (streq(key, "control-command")) { ServiceExecCommand id; @@ -2083,49 +2204,49 @@ static int service_deserialize_item(Unit *u, const char *key, const char *value, } else if (streq(key, "main-exec-status-pid")) { pid_t pid; - if ((r = parse_pid(value, &pid)) < 0) + if (parse_pid(value, &pid) < 0) log_debug("Failed to parse main-exec-status-pid value %s", value); else s->main_exec_status.pid = pid; } else if (streq(key, "main-exec-status-code")) { int i; - if ((r = safe_atoi(value, &i)) < 0) + if (safe_atoi(value, &i) < 0) log_debug("Failed to parse main-exec-status-code value %s", value); else s->main_exec_status.code = i; } else if (streq(key, "main-exec-status-status")) { int i; - if ((r = safe_atoi(value, &i)) < 0) + if (safe_atoi(value, &i) < 0) log_debug("Failed to parse main-exec-status-status value %s", value); else s->main_exec_status.status = i; } else if (streq(key, "main-exec-status-start-realtime")) { uint64_t k; - if ((r = safe_atou64(value, &k)) < 0) + if (safe_atou64(value, &k) < 0) log_debug("Failed to parse main-exec-status-start-realtime value %s", value); else s->main_exec_status.start_timestamp.realtime = (usec_t) k; } else if (streq(key, "main-exec-status-start-monotonic")) { uint64_t k; - if ((r = safe_atou64(value, &k)) < 0) + if (safe_atou64(value, &k) < 0) log_debug("Failed to parse main-exec-status-start-monotonic value %s", value); else s->main_exec_status.start_timestamp.monotonic = (usec_t) k; } else if (streq(key, "main-exec-status-exit-realtime")) { uint64_t k; - if ((r = safe_atou64(value, &k)) < 0) + if (safe_atou64(value, &k) < 0) log_debug("Failed to parse main-exec-status-exit-realtime value %s", value); else s->main_exec_status.exit_timestamp.realtime = (usec_t) k; } else if (streq(key, "main-exec-status-exit-monotonic")) { uint64_t k; - if ((r = safe_atou64(value, &k)) < 0) + if (safe_atou64(value, &k) < 0) log_debug("Failed to parse main-exec-status-exit-monotonic value %s", value); else s->main_exec_status.exit_timestamp.monotonic = (usec_t) k; @@ -2170,69 +2291,90 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) { assert(s); assert(pid >= 0); - success = is_clean_exit(code, status); + if (s->sysv_path) + success = is_clean_exit_lsb(code, status); + else + success = is_clean_exit(code, status); if (s->main_pid == pid) { - exec_status_exit(&s->main_exec_status, pid, code, status); s->main_pid = 0; + exec_status_exit(&s->main_exec_status, pid, code, status); - if (s->type != SERVICE_FORKING) { - assert(s->exec_command[SERVICE_EXEC_START]); - s->exec_command[SERVICE_EXEC_START]->exec_status = s->main_exec_status; + if (s->type != SERVICE_FORKING && s->control_command) { + s->control_command->exec_status = s->main_exec_status; - if (s->exec_command[SERVICE_EXEC_START]->ignore) + if (s->control_command->ignore) success = true; } - log_debug("%s: main process exited, code=%s, status=%i", u->meta.id, sigchld_code_to_string(code), status); + log_full(success ? LOG_DEBUG : LOG_NOTICE, + "%s: main process exited, code=%s, status=%i", u->meta.id, sigchld_code_to_string(code), status); s->failure = s->failure || !success; - /* The service exited, so the service is officially - * gone. */ + if (s->control_command && + s->control_command->command_next && + success) { - switch (s->state) { + /* There is another command to * + * execute, so let's do that. */ - case SERVICE_START_POST: - case SERVICE_RELOAD: - case SERVICE_STOP: - /* Need to wait until the operation is - * done */ - break; + log_debug("%s running next main command for state %s", u->meta.id, service_state_to_string(s->state)); + service_run_next_main(s, success); - case SERVICE_START: - if (s->type == SERVICE_FINISH) { - /* This was our main goal, so let's go on */ - if (success) - service_enter_start_post(s); - else - service_enter_signal(s, SERVICE_FINAL_SIGTERM, false); + } else { + + /* The service exited, so the service is officially + * gone. */ + + s->control_command = NULL; + s->control_command_id = _SERVICE_EXEC_COMMAND_INVALID; + + switch (s->state) { + + case SERVICE_START_POST: + case SERVICE_RELOAD: + case SERVICE_STOP: + /* Need to wait until the operation is + * done */ break; - } else { - assert(s->type == SERVICE_DBUS || s->type == SERVICE_NOTIFY); - /* Fall through */ - } + case SERVICE_START: + if (s->type == SERVICE_ONESHOT) { + /* This was our main goal, so let's go on */ + if (success) + service_enter_start_post(s); + else + service_enter_signal(s, SERVICE_FINAL_SIGTERM, false); + break; + } else { + assert(s->type == SERVICE_DBUS || s->type == SERVICE_NOTIFY); - case SERVICE_RUNNING: - service_enter_running(s, success); - break; + /* Fall through */ + } - case SERVICE_STOP_SIGTERM: - case SERVICE_STOP_SIGKILL: + case SERVICE_RUNNING: + service_enter_running(s, success); + break; - if (!control_pid_good(s)) - service_enter_stop_post(s, success); + case SERVICE_STOP_SIGTERM: + case SERVICE_STOP_SIGKILL: - /* If there is still a control process, wait for that first */ - break; + if (!control_pid_good(s)) + service_enter_stop_post(s, success); - default: - assert_not_reached("Uh, main process died at wrong time."); + /* If there is still a control process, wait for that first */ + break; + + default: + assert_not_reached("Uh, main process died at wrong time."); + } } } else if (s->control_pid == pid) { + s->control_pid = 0; + if (s->control_command) { exec_status_exit(&s->control_command->exec_status, pid, code, status); @@ -2240,21 +2382,19 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) { success = true; } - s->control_pid = 0; - - log_debug("%s: control process exited, code=%s status=%i", u->meta.id, sigchld_code_to_string(code), status); + log_full(success ? LOG_DEBUG : LOG_NOTICE, + "%s: control process exited, code=%s status=%i", u->meta.id, sigchld_code_to_string(code), status); s->failure = s->failure || !success; - /* If we are shutting things down anyway we - * don't care about failing commands. */ - - if (s->control_command && s->control_command->command_next && success) { + if (s->control_command && + s->control_command->command_next && + success) { /* There is another command to * * execute, so let's do that. */ - log_debug("%s running next command for state %s", u->meta.id, service_state_to_string(s->state)); - service_run_next(s, success); + log_debug("%s running next control command for state %s", u->meta.id, service_state_to_string(s->state)); + service_run_next_control(s, success); } else { /* No further commands for this step, so let's @@ -2342,6 +2482,9 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) { } } } + + /* Notify clients about changed exit status */ + unit_add_to_dbus_queue(u); } static void service_timer_event(Unit *u, uint64_t elapsed, Watch* w) { @@ -2396,7 +2539,7 @@ static void service_timer_event(Unit *u, uint64_t elapsed, Watch* w) { break; case SERVICE_FINAL_SIGKILL: - log_warning("%s still around after SIGKILL (2). Entering maintenance mode.", u->meta.id); + log_warning("%s still around after SIGKILL (2). Entering failed mode.", u->meta.id); service_enter_dead(s, false, true); break; @@ -2429,6 +2572,13 @@ static void service_cgroup_notify_event(Unit *u) { service_enter_running(s, true); break; + case SERVICE_STOP_SIGTERM: + case SERVICE_STOP_SIGKILL: + if (main_pid_good(s) <= 0 && !control_pid_good(s)) + service_enter_stop_post(s, true); + + break; + default: ; } @@ -2462,7 +2612,7 @@ static void service_notify_message(Unit *u, pid_t pid, char **tags) { s->state == SERVICE_RELOAD)) { if (parse_pid(e + 8, &pid) < 0) - log_warning("Failed to parse %s", e); + log_warning("Failed to parse notification message %s", e); else { log_debug("%s: got %s", u->meta.id, e); service_set_main_pid(s, pid); @@ -2482,16 +2632,25 @@ static void service_notify_message(Unit *u, pid_t pid, char **tags) { if ((e = strv_find_prefix(tags, "STATUS="))) { char *t; - if (!(t = strdup(e+7))) { - log_error("Failed to allocate string."); - return; - } + if (e[7]) { + if (!(t = strdup(e+7))) { + log_error("Failed to allocate string."); + return; + } + + log_debug("%s: got %s", u->meta.id, e); - log_debug("%s: got %s", u->meta.id, e); + free(s->status_text); + s->status_text = t; + } else { + free(s->status_text); + s->status_text = NULL; + } - free(s->status_text); - s->status_text = t; } + + /* Notify clients about changed status or main pid */ + unit_add_to_dbus_queue(u); } static int service_enumerate(Manager *m) { @@ -2570,9 +2729,11 @@ static int service_enumerate(Manager *m) { } if (de->d_name[0] == 'S' && - (rcnd_table[i].type == RUNLEVEL_UP || rcnd_table[i].type == RUNLEVEL_SYSINIT)) + (rcnd_table[i].type == RUNLEVEL_UP || rcnd_table[i].type == RUNLEVEL_SYSINIT)) { SERVICE(service)->sysv_start_priority = MAX(a*10 + b, SERVICE(service)->sysv_start_priority); + SERVICE(service)->sysv_enabled = true; + } manager_dispatch_load_queue(m); service = unit_follow_merge(service); @@ -2718,6 +2879,17 @@ int service_set_socket_fd(Service *s, int fd, Socket *sock) { return 0; } +static void service_reset_failed(Unit *u) { + Service *s = SERVICE(u); + + assert(s); + + if (s->state == SERVICE_FAILED) + service_set_state(s, SERVICE_DEAD); + + s->failure = false; +} + static const char* const service_state_table[_SERVICE_STATE_MAX] = { [SERVICE_DEAD] = "dead", [SERVICE_START_PRE] = "start-pre", @@ -2732,7 +2904,7 @@ static const char* const service_state_table[_SERVICE_STATE_MAX] = { [SERVICE_STOP_POST] = "stop-post", [SERVICE_FINAL_SIGTERM] = "final-sigterm", [SERVICE_FINAL_SIGKILL] = "final-sigkill", - [SERVICE_MAINTENANCE] = "maintenance", + [SERVICE_FAILED] = "failed", [SERVICE_AUTO_RESTART] = "auto-restart", }; @@ -2749,7 +2921,7 @@ DEFINE_STRING_TABLE_LOOKUP(service_restart, ServiceRestart); static const char* const service_type_table[_SERVICE_TYPE_MAX] = { [SERVICE_SIMPLE] = "simple", [SERVICE_FORKING] = "forking", - [SERVICE_FINISH] = "finish", + [SERVICE_ONESHOT] = "oneshot", [SERVICE_DBUS] = "dbus", [SERVICE_NOTIFY] = "notify" }; @@ -2805,13 +2977,17 @@ const UnitVTable service_vtable = { .sigchld_event = service_sigchld_event, .timer_event = service_timer_event, + .reset_failed = service_reset_failed, + .cgroup_notify_empty = service_cgroup_notify_event, .notify_message = service_notify_message, .bus_name_owner_change = service_bus_name_owner_change, .bus_query_pid_done = service_bus_query_pid_done, + .bus_interface = "org.freedesktop.systemd1.Service", .bus_message_handler = bus_service_message_handler, + .bus_invalidating_properties = bus_service_invalidating_properties, .enumerate = service_enumerate };