X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fservice.c;h=b837cb81e59c856d54a5d2a89d8bde6d4fa256f7;hp=987320178a785afcb20b5179e18e93d5dc7944fe;hb=3f6c78dcebdc0904d3b614da07e9ec8d84de2532;hpb=bb00e604097fba830af1dc078d78aff278dfcd37 diff --git a/src/service.c b/src/service.c index 987320178..b837cb81e 100644 --- a/src/service.c +++ b/src/service.c @@ -33,10 +33,10 @@ #include "unit-name.h" #include "dbus-service.h" #include "special.h" +#include "bus-errors.h" #define COMMENTS "#;\n" #define NEWLINES "\n\r" -#define LINE_MAX 4096 typedef enum RunlevelType { RUNLEVEL_UP, @@ -76,15 +76,15 @@ static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = { [SERVICE_START_POST] = UNIT_ACTIVATING, [SERVICE_RUNNING] = UNIT_ACTIVE, [SERVICE_EXITED] = UNIT_ACTIVE, - [SERVICE_RELOAD] = UNIT_ACTIVE_RELOADING, + [SERVICE_RELOAD] = UNIT_RELOADING, [SERVICE_STOP] = UNIT_DEACTIVATING, [SERVICE_STOP_SIGTERM] = UNIT_DEACTIVATING, [SERVICE_STOP_SIGKILL] = UNIT_DEACTIVATING, [SERVICE_STOP_POST] = UNIT_DEACTIVATING, [SERVICE_FINAL_SIGTERM] = UNIT_DEACTIVATING, [SERVICE_FINAL_SIGKILL] = UNIT_DEACTIVATING, - [SERVICE_MAINTENANCE] = UNIT_INACTIVE, - [SERVICE_AUTO_RESTART] = UNIT_ACTIVATING, + [SERVICE_MAINTENANCE] = UNIT_MAINTENANCE, + [SERVICE_AUTO_RESTART] = UNIT_ACTIVATING }; static void service_init(Unit *u) { @@ -144,6 +144,8 @@ static int service_set_main_pid(Service *s, pid_t pid) { s->main_pid = pid; s->main_pid_known = true; + exec_status_start(&s->main_exec_status, pid); + return 0; } @@ -279,7 +281,7 @@ static int sysv_fix_order(Service *s) { /* For each pair of services where at least one lacks a LSB * header, we use the start priority value to order things. */ - LIST_FOREACH(units_per_type, other, UNIT(s)->meta.manager->units_per_type[UNIT_SERVICE]) { + LIST_FOREACH(units_per_type, other, s->meta.manager->units_per_type[UNIT_SERVICE]) { Service *t; UnitDependency d; @@ -455,7 +457,8 @@ static int service_load_sysv_path(Service *s, const char *path) { s->sysv_runlevels = d; } - } else if (startswith_no_case(t, "description:")) { + } else if (startswith_no_case(t, "description:") && + !u->meta.description) { size_t k = strlen(t); char *d; @@ -524,7 +527,7 @@ static int service_load_sysv_path(Service *s, const char *path) { state = LSB; - FOREACH_WORD(w, z, t+9, i) { + FOREACH_WORD_QUOTED(w, z, t+9, i) { char *n, *m; if (!(n = strndup(w, z))) { @@ -543,10 +546,8 @@ 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 ((r = unit_add_dependency_by_name_inverse(u, UNIT_REQUIRES, m, NULL, true)) >= 0) - r = unit_add_dependency_by_name(u, UNIT_BEFORE, m, NULL, true); - } + else + r = unit_add_two_dependencies_by_name_inverse(u, UNIT_AFTER, UNIT_REQUIRES, m, NULL, true); free(m); @@ -563,7 +564,7 @@ static int service_load_sysv_path(Service *s, const char *path) { state = LSB; - FOREACH_WORD(w, z, strchr(t, ':')+1, i) { + FOREACH_WORD_QUOTED(w, z, strchr(t, ':')+1, i) { char *n, *m; if (!(n = strndup(w, z))) { @@ -603,9 +604,13 @@ static int service_load_sysv_path(Service *s, const char *path) { s->sysv_runlevels = d; } - } else if (startswith_no_case(t, "Description:")) { + } else if (startswith_no_case(t, "Description:") && + !u->meta.description) { char *d; + /* We use the long description only if + * no short description is set. */ + state = LSB_DESCRIPTION; if (!(d = strdup(strstrip(t+12)))) { @@ -616,13 +621,9 @@ static int service_load_sysv_path(Service *s, const char *path) { free(u->meta.description); u->meta.description = d; - } else if (startswith_no_case(t, "Short-Description:") && - !u->meta.description) { + } else if (startswith_no_case(t, "Short-Description:")) { char *d; - /* We use the short description only - * if no long description is set. */ - state = LSB; if (!(d = strdup(strstrip(t+18)))) { @@ -667,26 +668,25 @@ static int service_load_sysv_path(Service *s, const char *path) { if ((r = sysv_exec_commands(s)) < 0) goto finish; - if (!s->sysv_runlevels || chars_intersect(RUNLEVELS_UP, s->sysv_runlevels)) { + if (s->sysv_runlevels && !chars_intersect(RUNLEVELS_UP, s->sysv_runlevels)) { /* If there a runlevels configured for this service * but none of the standard ones, then we assume this * is some special kind of service (which might be * needed for early boot) and don't create any links * to it. */ - if ((r = unit_add_dependency_by_name(u, UNIT_REQUIRES, SPECIAL_BASIC_TARGET, NULL, true)) < 0 || - (r = unit_add_dependency_by_name(u, UNIT_AFTER, SPECIAL_BASIC_TARGET, NULL, true)) < 0) - goto finish; + s->meta.default_dependencies = false; - } else /* Don't timeout special services during boot (like fsck) */ s->timeout_usec = 0; + } /* Special setting for all SysV services */ s->type = SERVICE_FORKING; s->valid_no_process = true; - s->kill_mode = KILL_PROCESS_GROUP; s->restart = SERVICE_ONCE; + s->exec_context.std_output = EXEC_OUTPUT_TTY; + s->exec_context.kill_mode = KILL_PROCESS_GROUP; u->meta.load_state = UNIT_LOADED; r = 0; @@ -711,7 +711,7 @@ static int service_load_sysv_name(Service *s, const char *name) { endswith(name, ".sh.service")) return -ENOENT; - STRV_FOREACH(p, UNIT(s)->meta.manager->lookup_paths.sysvinit_path) { + STRV_FOREACH(p, s->meta.manager->lookup_paths.sysvinit_path) { char *path; int r; @@ -723,7 +723,7 @@ static int service_load_sysv_name(Service *s, const char *name) { r = service_load_sysv_path(s, path); - if (r >= 0 && UNIT(s)->meta.load_state == UNIT_STUB) { + if (r >= 0 && s->meta.load_state == UNIT_STUB) { /* Try Debian style xxx.sh source'able init scripts */ strcat(path, ".sh"); r = service_load_sysv_path(s, path); @@ -731,7 +731,7 @@ static int service_load_sysv_name(Service *s, const char *name) { free(path); - if (r >= 0 && UNIT(s)->meta.load_state == UNIT_STUB) { + if (r >= 0 && s->meta.load_state == UNIT_STUB) { /* Try SUSE style boot.xxx init scripts */ if (asprintf(&path, "%s/boot.%s", *p, name) < 0) @@ -745,7 +745,7 @@ static int service_load_sysv_name(Service *s, const char *name) { if (r < 0) return r; - if ((UNIT(s)->meta.load_state != UNIT_STUB)) + if ((s->meta.load_state != UNIT_STUB)) break; } @@ -762,22 +762,22 @@ static int service_load_sysv(Service *s) { /* Load service data from SysV init scripts, preferably with * LSB headers ... */ - if (strv_isempty(UNIT(s)->meta.manager->lookup_paths.sysvinit_path)) + if (strv_isempty(s->meta.manager->lookup_paths.sysvinit_path)) return 0; - if ((t = UNIT(s)->meta.id)) + if ((t = s->meta.id)) if ((r = service_load_sysv_name(s, t)) < 0) return r; - if (UNIT(s)->meta.load_state == UNIT_STUB) - SET_FOREACH(t, UNIT(s)->meta.names, i) { - if (t == UNIT(s)->meta.id) + if (s->meta.load_state == UNIT_STUB) + SET_FOREACH(t, s->meta.names, i) { + if (t == s->meta.id) continue; if ((r == service_load_sysv_name(s, t)) < 0) return r; - if (UNIT(s)->meta.load_state != UNIT_STUB) + if (s->meta.load_state != UNIT_STUB) break; } @@ -803,27 +803,56 @@ static int service_add_bus_name(Service *s) { static int service_verify(Service *s) { assert(s); - if (UNIT(s)->meta.load_state != UNIT_LOADED) + if (s->meta.load_state != UNIT_LOADED) return 0; if (!s->exec_command[SERVICE_EXEC_START]) { - log_error("%s lacks ExecStart setting. Refusing.", UNIT(s)->meta.id); + log_error("%s lacks ExecStart setting. Refusing.", s->meta.id); return -EINVAL; } if (s->exec_command[SERVICE_EXEC_START]->command_next) { - log_error("%s has more than one ExecStart setting. Refusing.", UNIT(s)->meta.id); + log_error("%s has more than one ExecStart setting. Refusing.", s->meta.id); return -EINVAL; } if (s->type == SERVICE_DBUS && !s->bus_name) { - log_error("%s is of type D-Bus but no D-Bus service name has been specified. Refusing.", UNIT(s)->meta.id); + log_error("%s is of type D-Bus but no D-Bus service name has been specified. Refusing.", s->meta.id); + return -EINVAL; + } + + if (s->exec_context.pam_name && s->exec_context.kill_mode != KILL_CONTROL_GROUP) { + log_error("%s has PAM enabled. Kill mode must be set to 'control-group'. Refusing.", s->meta.id); return -EINVAL; } return 0; } +static int service_add_default_dependencies(Service *s) { + int r; + + assert(s); + + /* Add a number of automatic dependencies useful for the + * majority of services. */ + + /* First, pull in base system */ + if (s->meta.manager->running_as == MANAGER_SYSTEM) { + + if ((r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_BASIC_TARGET, NULL, true)) < 0) + return r; + + } else if (s->meta.manager->running_as == MANAGER_SESSION) { + + if ((r = unit_add_two_dependencies_by_name(UNIT(s), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_SOCKETS_TARGET, NULL, true)) < 0) + return r; + } + + /* Second, activate normal shutdown */ + return unit_add_two_dependencies_by_name(UNIT(s), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true); +} + static int service_load(Unit *u) { int r; Service *s = SERVICE(u); @@ -864,11 +893,19 @@ static int service_load(Unit *u) { return r; if ((r = unit_watch_bus_name(u, s->bus_name)) < 0) - return r; + return r; } if (s->type == SERVICE_NOTIFY && s->notify_access == NOTIFY_NONE) s->notify_access = NOTIFY_MAIN; + + if (s->type == SERVICE_DBUS || s->bus_name) + if ((r = unit_add_two_dependencies_by_name(u, UNIT_AFTER, UNIT_REQUIRES, SPECIAL_DBUS_TARGET, NULL, true)) < 0) + return r; + + if (s->meta.default_dependencies) + if ((r = service_add_default_dependencies(s)) < 0) + return r; } return service_verify(s); @@ -891,14 +928,12 @@ static void service_dump(Unit *u, FILE *f, const char *prefix) { "%sPermissionsStartOnly: %s\n" "%sRootDirectoryStartOnly: %s\n" "%sValidNoProcess: %s\n" - "%sKillMode: %s\n" "%sType: %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, kill_mode_to_string(s->kill_mode), prefix, service_type_to_string(s->type), prefix, notify_access_to_string(s->notify_access)); @@ -1019,7 +1054,7 @@ static int service_get_sockets(Service *s, Set **_set) { if (!(set = set_new(NULL, NULL))) return -ENOMEM; - SET_FOREACH(t, UNIT(s)->meta.names, i) { + SET_FOREACH(t, s->meta.names, i) { char *k; Unit *p; @@ -1031,7 +1066,7 @@ static int service_get_sockets(Service *s, Set **_set) { goto fail; } - p = manager_get_unit(UNIT(s)->meta.manager, k); + p = manager_get_unit(s->meta.manager, k); free(k); if (!p) @@ -1138,13 +1173,13 @@ static void service_set_state(Service *s, ServiceState state) { state != SERVICE_STOP_POST && state != SERVICE_FINAL_SIGTERM && state != SERVICE_FINAL_SIGKILL && - !(state == SERVICE_DEAD && UNIT(s)->meta.job)) { + !(state == SERVICE_DEAD && s->meta.job)) { service_close_socket_fd(s); service_connection_unref(s); } if (old_state != state) - log_debug("%s changed %s -> %s", UNIT(s)->meta.id, service_state_to_string(old_state), service_state_to_string(state)); + log_debug("%s changed %s -> %s", s->meta.id, service_state_to_string(old_state), service_state_to_string(state)); unit_notify(UNIT(s), state_translation_table[old_state], state_translation_table[state]); } @@ -1286,14 +1321,15 @@ static int service_spawn( bool pass_fds, bool apply_permissions, bool apply_chroot, + bool apply_tty_stdin, bool set_notify_socket, pid_t *_pid) { pid_t pid; int r; int *fds = NULL, *fdsbuf = NULL; - unsigned n_fds = 0; - char **argv = NULL, **env = NULL; + unsigned n_fds = 0, n_env = 0; + char **argv = NULL, **final_env = NULL, **our_env = NULL; assert(s); assert(c); @@ -1326,63 +1362,65 @@ static int service_spawn( goto fail; } - if (set_notify_socket) { - char *t; + if (!(our_env = new0(char*, 3))) { + r = -ENOMEM; + goto fail; + } - if (asprintf(&t, "NOTIFY_SOCKET=@%s", s->meta.manager->notify_socket) < 0) { + if (set_notify_socket) + if (asprintf(our_env + n_env++, "NOTIFY_SOCKET=@%s", s->meta.manager->notify_socket) < 0) { r = -ENOMEM; goto fail; } - env = strv_env_set(s->meta.manager->environment, t); - free(t); - - if (!env) { + if (s->main_pid > 0) + if (asprintf(our_env + n_env++, "MAINPID=%lu", (unsigned long) s->main_pid) < 0) { r = -ENOMEM; goto fail; } - } else - env = s->meta.manager->environment; + + if (!(final_env = strv_env_merge(2, + s->meta.manager->environment, + our_env, + NULL))) { + r = -ENOMEM; + goto fail; + } r = exec_spawn(c, argv, &s->exec_context, fds, n_fds, - env, + final_env, apply_permissions, apply_chroot, - UNIT(s)->meta.manager->confirm_spawn, - UNIT(s)->meta.cgroup_bondings, + apply_tty_stdin, + s->meta.manager->confirm_spawn, + s->meta.cgroup_bondings, &pid); - strv_free(argv); - argv = NULL; - - if (set_notify_socket) - strv_free(env); - env = NULL; - if (r < 0) goto fail; - if (fdsbuf) - free(fdsbuf); if ((r = unit_watch_pid(UNIT(s), pid)) < 0) /* FIXME: we need to do something here */ goto fail; + free(fdsbuf); + strv_free(argv); + strv_free(our_env); + strv_free(final_env); + *_pid = pid; return 0; fail: - free(fds); - + free(fdsbuf); strv_free(argv); - - if (set_notify_socket) - strv_free(env); + strv_free(our_env); + strv_free(final_env); if (timeout) unit_unwatch_timer(UNIT(s), &s->timer_watch); @@ -1416,7 +1454,7 @@ static int cgroup_good(Service *s) { assert(s); - if ((r = cgroup_bonding_is_empty_list(UNIT(s)->meta.cgroup_bondings)) < 0) + if ((r = cgroup_bonding_is_empty_list(s->meta.cgroup_bondings)) < 0) return r; return !r; @@ -1444,7 +1482,7 @@ static void service_enter_dead(Service *s, bool success, bool allow_restart) { return; fail: - log_warning("%s failed to run install restart timer: %s", UNIT(s)->meta.id, strerror(-r)); + log_warning("%s failed to run install restart timer: %s", s->meta.id, strerror(-r)); service_enter_dead(s, false, false); } @@ -1467,6 +1505,7 @@ static void service_enter_stop_post(Service *s, bool success) { false, !s->permissions_start_only, !s->root_directory_start_only, + true, false, &s->control_pid)) < 0) goto fail; @@ -1479,7 +1518,7 @@ static void service_enter_stop_post(Service *s, bool success) { return; fail: - log_warning("%s failed to run 'stop-post' task: %s", UNIT(s)->meta.id, strerror(-r)); + log_warning("%s failed to run 'stop-post' task: %s", s->meta.id, strerror(-r)); service_enter_signal(s, SERVICE_FINAL_SIGTERM, false); } @@ -1492,12 +1531,12 @@ static void service_enter_signal(Service *s, ServiceState state, bool success) { if (!success) s->failure = true; - if (s->kill_mode != KILL_NONE) { - int sig = (state == SERVICE_STOP_SIGTERM || state == SERVICE_FINAL_SIGTERM) ? SIGTERM : SIGKILL; + 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->kill_mode == KILL_CONTROL_GROUP) { + if (s->exec_context.kill_mode == KILL_CONTROL_GROUP) { - if ((r = cgroup_bonding_kill_list(UNIT(s)->meta.cgroup_bondings, sig)) < 0) { + if ((r = cgroup_bonding_kill_list(s->meta.cgroup_bondings, sig)) < 0) { if (r != -EAGAIN && r != -ESRCH) goto fail; } else @@ -1508,14 +1547,14 @@ static void service_enter_signal(Service *s, ServiceState state, bool success) { r = 0; if (s->main_pid > 0) { - if (kill(s->kill_mode == KILL_PROCESS ? s->main_pid : -s->main_pid, sig) < 0 && errno != ESRCH) + if (kill(s->exec_context.kill_mode == KILL_PROCESS ? s->main_pid : -s->main_pid, sig) < 0 && errno != ESRCH) r = -errno; else sent = true; } if (s->control_pid > 0) { - if (kill(s->kill_mode == KILL_PROCESS ? s->control_pid : -s->control_pid, sig) < 0 && errno != ESRCH) + if (kill(s->exec_context.kill_mode == KILL_PROCESS ? s->control_pid : -s->control_pid, sig) < 0 && errno != ESRCH) r = -errno; else sent = true; @@ -1540,7 +1579,7 @@ static void service_enter_signal(Service *s, ServiceState state, bool success) { return; fail: - log_warning("%s failed to kill processes: %s", UNIT(s)->meta.id, strerror(-r)); + log_warning("%s failed to kill processes: %s", s->meta.id, strerror(-r)); if (state == SERVICE_STOP_SIGTERM || state == SERVICE_STOP_SIGKILL) service_enter_stop_post(s, false); @@ -1567,6 +1606,7 @@ static void service_enter_stop(Service *s, bool success) { !s->permissions_start_only, !s->root_directory_start_only, false, + false, &s->control_pid)) < 0) goto fail; @@ -1577,18 +1617,21 @@ static void service_enter_stop(Service *s, bool success) { return; fail: - log_warning("%s failed to run 'stop' task: %s", UNIT(s)->meta.id, strerror(-r)); + log_warning("%s failed to run 'stop' task: %s", s->meta.id, strerror(-r)); service_enter_signal(s, SERVICE_STOP_SIGTERM, false); } static void service_enter_running(Service *s, bool success) { + int main_pid_ok, cgroup_ok; assert(s); if (!success) s->failure = true; - if (main_pid_good(s) != 0 && - cgroup_good(s) != 0 && + main_pid_ok = main_pid_good(s); + cgroup_ok = cgroup_good(s); + + 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) @@ -1612,6 +1655,7 @@ static void service_enter_start_post(Service *s) { !s->permissions_start_only, !s->root_directory_start_only, false, + false, &s->control_pid)) < 0) goto fail; @@ -1622,7 +1666,7 @@ static void service_enter_start_post(Service *s) { return; fail: - log_warning("%s failed to run 'start-post' task: %s", UNIT(s)->meta.id, strerror(-r)); + log_warning("%s failed to run 'start-post' task: %s", s->meta.id, strerror(-r)); service_enter_stop(s, false); } @@ -1646,6 +1690,7 @@ static void service_enter_start(Service *s) { true, true, true, + true, s->notify_access != NOTIFY_NONE, &pid)) < 0) goto fail; @@ -1687,7 +1732,7 @@ static void service_enter_start(Service *s) { return; fail: - log_warning("%s failed to run 'start' task: %s", UNIT(s)->meta.id, strerror(-r)); + log_warning("%s failed to run 'start' task: %s", s->meta.id, strerror(-r)); service_enter_signal(s, SERVICE_FINAL_SIGTERM, false); } @@ -1706,6 +1751,7 @@ static void service_enter_start_pre(Service *s) { false, !s->permissions_start_only, !s->root_directory_start_only, + true, false, &s->control_pid)) < 0) goto fail; @@ -1717,26 +1763,30 @@ static void service_enter_start_pre(Service *s) { return; fail: - log_warning("%s failed to run 'start-pre' task: %s", UNIT(s)->meta.id, strerror(-r)); + log_warning("%s failed to run 'start-pre' task: %s", s->meta.id, strerror(-r)); service_enter_dead(s, false, true); } static void service_enter_restart(Service *s) { int r; + DBusError error; + assert(s); + dbus_error_init(&error); service_enter_dead(s, true, false); - if ((r = manager_add_job(UNIT(s)->meta.manager, JOB_START, UNIT(s), JOB_FAIL, false, NULL)) < 0) + if ((r = manager_add_job(s->meta.manager, JOB_START, UNIT(s), JOB_FAIL, false, NULL, NULL)) < 0) goto fail; - log_debug("%s scheduled restart job.", UNIT(s)->meta.id); + log_debug("%s scheduled restart job.", s->meta.id); return; fail: - - log_warning("%s failed to schedule restart job: %s", UNIT(s)->meta.id, strerror(-r)); + log_warning("%s failed to schedule restart job: %s", s->meta.id, bus_error(&error, -r)); service_enter_dead(s, false, false); + + dbus_error_free(&error); } static void service_enter_reload(Service *s) { @@ -1755,6 +1805,7 @@ static void service_enter_reload(Service *s) { !s->permissions_start_only, !s->root_directory_start_only, false, + false, &s->control_pid)) < 0) goto fail; @@ -1765,7 +1816,7 @@ static void service_enter_reload(Service *s) { return; fail: - log_warning("%s failed to run 'reload' task: %s", UNIT(s)->meta.id, strerror(-r)); + log_warning("%s failed to run 'reload' task: %s", s->meta.id, strerror(-r)); service_enter_stop(s, false); } @@ -1790,13 +1841,14 @@ static void service_run_next(Service *s, bool success) { !s->permissions_start_only, !s->root_directory_start_only, false, + false, &s->control_pid)) < 0) goto fail; return; fail: - log_warning("%s failed to run next task: %s", UNIT(s)->meta.id, strerror(-r)); + log_warning("%s failed to run next task: %s", s->meta.id, strerror(-r)); if (s->state == SERVICE_START_PRE) service_enter_signal(s, SERVICE_FINAL_SIGTERM, false); @@ -1850,12 +1902,9 @@ static int service_stop(Unit *u) { assert(s); - /* Cannot do this now */ - if (s->state == SERVICE_START_PRE || - s->state == SERVICE_START || - s->state == SERVICE_START_POST || - s->state == SERVICE_RELOAD) - return -EAGAIN; + /* This is a user request, so don't do restarts on this + * shutdown. */ + s->allow_restart = false; /* Already on it */ if (s->state == SERVICE_STOP || @@ -1866,16 +1915,24 @@ static int service_stop(Unit *u) { s->state == SERVICE_FINAL_SIGKILL) return 0; + /* Don't allow a restart */ if (s->state == SERVICE_AUTO_RESTART) { service_set_state(s, SERVICE_DEAD); return 0; } - assert(s->state == SERVICE_RUNNING || s->state == SERVICE_EXITED); + /* If there's already something running we go directly into + * kill mode. */ + if (s->state == SERVICE_START_PRE || + s->state == SERVICE_START || + s->state == SERVICE_START_POST || + s->state == SERVICE_RELOAD) { + service_enter_signal(s, SERVICE_STOP_SIGTERM, true); + return 0; + } - /* This is a user request, so don't do restarts on this - * shutdown. */ - s->allow_restart = false; + assert(s->state == SERVICE_RUNNING || + s->state == SERVICE_EXITED); service_enter_stop(s, true); return 0; @@ -1933,6 +1990,28 @@ static int service_serialize(Unit *u, FILE *f, FDSet *fds) { unit_serialize_item_format(u, f, "socket-fd", "%i", copy); } + if (s->main_exec_status.pid > 0) { + unit_serialize_item_format(u, f, "main-exec-status-pid", "%lu", (unsigned long) s->main_exec_status.pid); + + if (s->main_exec_status.start_timestamp.realtime > 0) { + unit_serialize_item_format(u, f, "main-exec-status-start-realtime", + "%llu", (unsigned long long) s->main_exec_status.start_timestamp.realtime); + + unit_serialize_item_format(u, f, "main-exec-status-start-monotonic", + "%llu", (unsigned long long) s->main_exec_status.start_timestamp.monotonic); + } + + if (s->main_exec_status.exit_timestamp.realtime > 0) { + unit_serialize_item_format(u, f, "main-exec-status-exit-realtime", + "%llu", (unsigned long long) s->main_exec_status.exit_timestamp.realtime); + unit_serialize_item_format(u, f, "main-exec-status-exit-monotonic", + "%llu", (unsigned long long) s->main_exec_status.exit_timestamp.monotonic); + + unit_serialize_item_format(u, f, "main-exec-status-code", "%i", s->main_exec_status.code); + unit_serialize_item_format(u, f, "main-exec-status-status", "%i", s->main_exec_status.status); + } + } + return 0; } @@ -2000,6 +2079,55 @@ static int service_deserialize_item(Unit *u, const char *key, const char *value, close_nointr_nofail(s->socket_fd); s->socket_fd = fdset_remove(fds, fd); } + } else if (streq(key, "main-exec-status-pid")) { + pid_t pid; + + if ((r = 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) + 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) + 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) + 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) + 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) + 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) + log_debug("Failed to parse main-exec-status-exit-monotonic value %s", value); + else + s->main_exec_status.exit_timestamp.monotonic = (usec_t) k; } else log_debug("Unknown serialization key '%s'", key); @@ -2046,7 +2174,7 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) { if (s->main_pid == pid) { - exec_status_fill(&s->main_exec_status, pid, code, status); + exec_status_exit(&s->main_exec_status, pid, code, status); s->main_pid = 0; if (s->type != SERVICE_FORKING) { @@ -2102,7 +2230,7 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) { } else if (s->control_pid == pid) { if (s->control_command) - exec_status_fill(&s->control_command->exec_status, pid, code, status); + exec_status_exit(&s->control_command->exec_status, pid, code, status); s->control_pid = 0; @@ -2167,7 +2295,7 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) { * executed. */ if ((r = service_load_pid_file(s)) < 0) - log_warning("%s: failed to load PID file %s: %s", UNIT(s)->meta.id, s->pid_file, strerror(-r)); + log_warning("%s: failed to load PID file %s: %s", s->meta.id, s->pid_file, strerror(-r)); } /* Fall through */ @@ -2264,7 +2392,7 @@ static void service_timer_event(Unit *u, uint64_t elapsed, Watch* w) { break; case SERVICE_AUTO_RESTART: - log_debug("%s holdoff time over, scheduling restart.", u->meta.id); + log_info("%s holdoff time over, scheduling restart.", u->meta.id); service_enter_restart(s); break; @@ -2427,7 +2555,7 @@ static int service_enumerate(Manager *m) { goto finish; } - if ((r = manager_load_unit_prepare(m, name, NULL, &service)) < 0) { + if ((r = manager_load_unit_prepare(m, name, NULL, NULL, &service)) < 0) { log_warning("Failed to prepare unit %s: %s", name, strerror(-r)); continue; } @@ -2440,22 +2568,21 @@ static int service_enumerate(Manager *m) { manager_dispatch_load_queue(m); service = unit_follow_merge(service); - if (de->d_name[0] == 'S') { - Unit *runlevel_target; - - if ((r = manager_load_unit(m, rcnd_table[i].target, NULL, &runlevel_target)) < 0) - goto finish; + /* If this is a native service, rely + * on native ways to pull in a + * service, don't pull it in via sysv + * rcN.d links. */ + if (service->meta.fragment_path) + continue; - if ((r = unit_add_dependency(runlevel_target, UNIT_WANTS, service, true)) < 0) - goto finish; + if (de->d_name[0] == 'S') { - if ((r = unit_add_dependency(service, UNIT_BEFORE, runlevel_target, true)) < 0) + if ((r = unit_add_two_dependencies_by_name_inverse(service, UNIT_AFTER, UNIT_WANTS, rcnd_table[i].target, NULL, true)) < 0) goto finish; } else if (de->d_name[0] == 'K' && (rcnd_table[i].type == RUNLEVEL_DOWN || rcnd_table[i].type == RUNLEVEL_SYSINIT)) { - Unit *shutdown_target; /* We honour K links only for * halt/reboot. For the normal @@ -2473,13 +2600,7 @@ static int service_enumerate(Manager *m) { * too to the shutdown * target.*/ - if ((r = manager_load_unit(m, SPECIAL_SHUTDOWN_TARGET, NULL, &shutdown_target)) < 0) - goto finish; - - if ((r = unit_add_dependency(service, UNIT_CONFLICTS, shutdown_target, true)) < 0) - goto finish; - - if ((r = unit_add_dependency(service, UNIT_BEFORE, shutdown_target, true)) < 0) + if ((r = unit_add_two_dependencies_by_name_inverse(service, UNIT_AFTER, UNIT_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true)) < 0) goto finish; } } @@ -2572,7 +2693,7 @@ int service_set_socket_fd(Service *s, int fd, Socket *sock) { * service for a stream socket and the socket needs to be * configured. */ - if (UNIT(s)->meta.load_state != UNIT_LOADED) + if (s->meta.load_state != UNIT_LOADED) return -EINVAL; if (s->socket_fd >= 0) @@ -2617,8 +2738,8 @@ static const char* const service_restart_table[_SERVICE_RESTART_MAX] = { DEFINE_STRING_TABLE_LOOKUP(service_restart, ServiceRestart); static const char* const service_type_table[_SERVICE_TYPE_MAX] = { - [SERVICE_FORKING] = "forking", [SERVICE_SIMPLE] = "simple", + [SERVICE_FORKING] = "forking", [SERVICE_FINISH] = "finish", [SERVICE_DBUS] = "dbus", [SERVICE_NOTIFY] = "notify" @@ -2647,6 +2768,7 @@ DEFINE_STRING_TABLE_LOOKUP(notify_access, NotifyAccess); const UnitVTable service_vtable = { .suffix = ".service", + .show_status = true, .init = service_init, .done = service_done,