X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fservice.c;h=b2e0f86ae8d6ac83b8f9e3fd6b2875b34b51964d;hb=eeaafddcb5ce492f2b3d53678820d41a04ab66b2;hp=1bfab5013d0cfe2cfb61a74d7cd5c453a1191ac8;hpb=cac6f7c87207b5079c1ae5c551869667bad4cfb8;p=elogind.git diff --git a/src/service.c b/src/service.c index 1bfab5013..b2e0f86ae 100644 --- a/src/service.c +++ b/src/service.c @@ -49,20 +49,28 @@ 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 }, /* SUSE style boot.d */ { "boot.d", SPECIAL_SYSINIT_TARGET, RUNLEVEL_SYSINIT }, /* Debian style rcS.d */ { "rcS.d", SPECIAL_SYSINIT_TARGET, RUNLEVEL_SYSINIT }, + + /* 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" @@ -284,6 +292,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 +308,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; @@ -546,8 +562,10 @@ 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_start_priority >= 0) + 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); + r = unit_add_dependency_by_name_inverse(u, UNIT_AFTER, m, NULL, true); free(m); @@ -1990,6 +2008,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 */ @@ -2074,6 +2095,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; @@ -2199,7 +2228,8 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) { 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 @@ -2256,7 +2286,8 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) { 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 @@ -2476,7 +2507,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); @@ -2496,15 +2527,21 @@ 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; } } @@ -2732,6 +2769,17 @@ int service_set_socket_fd(Service *s, int fd, Socket *sock) { return 0; } +static void service_reset_maintenance(Unit *u) { + Service *s = SERVICE(u); + + assert(s); + + if (s->state == SERVICE_MAINTENANCE) + 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", @@ -2819,6 +2867,8 @@ const UnitVTable service_vtable = { .sigchld_event = service_sigchld_event, .timer_event = service_timer_event, + .reset_maintenance = service_reset_maintenance, + .cgroup_notify_empty = service_cgroup_notify_event, .notify_message = service_notify_message,