#include "log.h"
#include "load-dropin.h"
#include "load-fragment.h"
+#include "strv.h"
static const UnitActiveState state_translation_table[_SOCKET_STATE_MAX] = {
[SOCKET_DEAD] = UNIT_INACTIVE,
[SOCKET_STOP_PRE_SIGTERM] = UNIT_DEACTIVATING,
[SOCKET_STOP_PRE_SIGKILL] = UNIT_DEACTIVATING,
[SOCKET_STOP_POST] = UNIT_DEACTIVATING,
- [SOCKET_STOP_POST_SIGTERM] = UNIT_DEACTIVATING,
- [SOCKET_STOP_POST_SIGKILL] = UNIT_DEACTIVATING,
+ [SOCKET_FINAL_SIGTERM] = UNIT_DEACTIVATING,
+ [SOCKET_FINAL_SIGKILL] = UNIT_DEACTIVATING,
[SOCKET_MAINTAINANCE] = UNIT_INACTIVE,
};
[SOCKET_STOP_PRE_SIGTERM] = "stop-pre-sigterm",
[SOCKET_STOP_PRE_SIGKILL] = "stop-pre-sigkill",
[SOCKET_STOP_POST] = "stop-post",
- [SOCKET_STOP_POST_SIGTERM] = "stop-post-sigterm",
- [SOCKET_STOP_POST_SIGKILL] = "stop-post-sigkill",
+ [SOCKET_FINAL_SIGTERM] = "final-sigterm",
+ [SOCKET_FINAL_SIGKILL] = "final-sigkill",
[SOCKET_MAINTAINANCE] = "maintainance"
};
state != SOCKET_STOP_PRE_SIGTERM &&
state != SOCKET_STOP_PRE_SIGKILL &&
state != SOCKET_STOP_POST &&
- state != SOCKET_STOP_POST_SIGTERM &&
- state != SOCKET_STOP_POST_SIGKILL) {
+ state != SOCKET_FINAL_SIGTERM &&
+ state != SOCKET_FINAL_SIGKILL) {
unit_unwatch_timer(UNIT(s), &s->timer_watch);
socket_unwatch_control_pid(s);
s->control_command = NULL;
socket_unwatch_fds(s);
if (state != old_state)
- log_debug("%s changed %s → %s", unit_id(UNIT(s)), state_string_table[old_state], state_string_table[state]);
+ log_debug("%s changed %s → %s", s->meta.id, state_string_table[old_state], state_string_table[state]);
unit_notify(UNIT(s), state_translation_table[old_state], state_translation_table[state]);
}
static int socket_spawn(Socket *s, ExecCommand *c, pid_t *_pid) {
pid_t pid;
int r;
+ char **argv;
assert(s);
assert(c);
if ((r = unit_watch_timer(UNIT(s), s->timeout_usec, &s->timer_watch)) < 0)
goto fail;
- if ((r = exec_spawn(c,
- &s->exec_context,
- NULL, 0,
- true,
- true,
- UNIT(s)->meta.cgroup_bondings,
- &pid)) < 0)
+ if (!(argv = unit_full_printf_strv(UNIT(s), c->argv))) {
+ r = -ENOMEM;
+ goto fail;
+ }
+
+ r = exec_spawn(c,
+ argv,
+ &s->exec_context,
+ NULL, 0,
+ true,
+ true,
+ UNIT(s)->meta.manager->confirm_spawn,
+ UNIT(s)->meta.cgroup_bondings,
+ &pid);
+
+ strv_free(argv);
+ if (r < 0)
goto fail;
if ((r = unit_watch_pid(UNIT(s), pid)) < 0)
socket_set_state(s, s->failure ? SOCKET_MAINTAINANCE : SOCKET_DEAD);
}
+static void socket_enter_signal(Socket *s, SocketState state, bool success);
+
static void socket_enter_stop_post(Socket *s, bool success) {
int r;
assert(s);
socket_unwatch_control_pid(s);
- if ((s->control_command = s->exec_command[SOCKET_EXEC_STOP_POST]))
+ if ((s->control_command = s->exec_command[SOCKET_EXEC_STOP_POST])) {
if ((r = socket_spawn(s, s->control_command, &s->control_pid)) < 0)
goto fail;
- socket_set_state(s, SOCKET_STOP_POST);
-
- if (!s->control_command)
- socket_enter_dead(s, true);
+ socket_set_state(s, SOCKET_STOP_POST);
+ } else
+ socket_enter_signal(s, SOCKET_FINAL_SIGTERM, true);
return;
fail:
- log_warning("%s failed to run stop-post executable: %s", unit_id(UNIT(s)), strerror(-r));
- socket_enter_dead(s, false);
+ log_warning("%s failed to run stop-post executable: %s", s->meta.id, strerror(-r));
+ socket_enter_signal(s, SOCKET_FINAL_SIGTERM, false);
}
static void socket_enter_signal(Socket *s, SocketState state, bool success) {
int r;
+ bool sent = false;
assert(s);
if (!success)
s->failure = true;
- if (s->control_pid > 0) {
- int sig;
- bool sent = false;
-
- sig = (state == SOCKET_STOP_PRE_SIGTERM || state == SOCKET_STOP_POST_SIGTERM) ? SIGTERM : SIGKILL;
+ if (s->kill_mode != KILL_NONE) {
+ int sig = (state == SOCKET_STOP_PRE_SIGTERM || state == SOCKET_FINAL_SIGTERM) ? SIGTERM : SIGKILL;
if (s->kill_mode == KILL_CONTROL_GROUP) {
sent = true;
}
- if (!sent)
+ if (!sent && s->control_pid > 0)
if (kill(s->kill_mode == KILL_PROCESS ? s->control_pid : -s->control_pid, sig) < 0 && errno != ESRCH) {
r = -errno;
goto fail;
}
}
- socket_set_state(s, state);
+ if (sent) {
+ if ((r = unit_watch_timer(UNIT(s), s->timeout_usec, &s->timer_watch)) < 0)
+ goto fail;
- if (s->control_pid <= 0)
+ socket_set_state(s, state);
+ } else if (state == SOCKET_STOP_PRE_SIGTERM || state == SOCKET_STOP_PRE_SIGKILL)
+ socket_enter_stop_post(s, true);
+ else
socket_enter_dead(s, true);
return;
fail:
- log_warning("%s failed to kill processes: %s", unit_id(UNIT(s)), strerror(-r));
+ log_warning("%s failed to kill processes: %s", s->meta.id, strerror(-r));
if (state == SOCKET_STOP_PRE_SIGTERM || state == SOCKET_STOP_PRE_SIGKILL)
socket_enter_stop_post(s, false);
socket_unwatch_control_pid(s);
- if ((s->control_command = s->exec_command[SOCKET_EXEC_STOP_PRE]))
+ if ((s->control_command = s->exec_command[SOCKET_EXEC_STOP_PRE])) {
if ((r = socket_spawn(s, s->control_command, &s->control_pid)) < 0)
goto fail;
- socket_set_state(s, SOCKET_STOP_PRE);
-
- if (!s->control_command)
+ socket_set_state(s, SOCKET_STOP_PRE);
+ } else
socket_enter_stop_post(s, true);
return;
fail:
- log_warning("%s failed to run stop-pre executable: %s", unit_id(UNIT(s)), strerror(-r));
+ log_warning("%s failed to run stop-pre executable: %s", s->meta.id, strerror(-r));
socket_enter_stop_post(s, false);
}
assert(s);
if ((r = socket_watch_fds(s)) < 0) {
- log_warning("%s failed to watch sockets: %s", unit_id(UNIT(s)), strerror(-r));
+ log_warning("%s failed to watch sockets: %s", s->meta.id, strerror(-r));
goto fail;
}
assert(s);
if ((r = socket_open_fds(s)) < 0) {
- log_warning("%s failed to listen on sockets: %s", unit_id(UNIT(s)), strerror(-r));
+ log_warning("%s failed to listen on sockets: %s", s->meta.id, strerror(-r));
goto fail;
}
socket_unwatch_control_pid(s);
- if ((s->control_command = s->exec_command[SOCKET_EXEC_START_POST]))
+ if ((s->control_command = s->exec_command[SOCKET_EXEC_START_POST])) {
if ((r = socket_spawn(s, s->control_command, &s->control_pid)) < 0) {
- log_warning("%s failed to run start-post executable: %s", unit_id(UNIT(s)), strerror(-r));
+ log_warning("%s failed to run start-post executable: %s", s->meta.id, strerror(-r));
goto fail;
}
- socket_set_state(s, SOCKET_START_POST);
-
- if (!s->control_command)
+ socket_set_state(s, SOCKET_START_POST);
+ } else
socket_enter_listening(s);
return;
socket_unwatch_control_pid(s);
- if ((s->control_command = s->exec_command[SOCKET_EXEC_START_PRE]))
+ if ((s->control_command = s->exec_command[SOCKET_EXEC_START_PRE])) {
if ((r = socket_spawn(s, s->control_command, &s->control_pid)) < 0)
goto fail;
- socket_set_state(s, SOCKET_START_PRE);
-
- if (!s->control_command)
+ socket_set_state(s, SOCKET_START_PRE);
+ } else
socket_enter_start_post(s);
return;
fail:
- log_warning("%s failed to run start-pre exectuable: %s", unit_id(UNIT(s)), strerror(-r));
+ log_warning("%s failed to run start-pre exectuable: %s", s->meta.id, strerror(-r));
socket_enter_dead(s, false);
}
return;
fail:
- log_warning("%s failed to queue socket startup job: %s", unit_id(UNIT(s)), strerror(-r));
- socket_enter_dead(s, false);
+ log_warning("%s failed to queue socket startup job: %s", s->meta.id, strerror(-r));
+ socket_enter_stop_pre(s, false);
}
static void socket_run_next(Socket *s, bool success) {
return;
fail:
- if (s->state == SOCKET_STOP_PRE)
- socket_enter_stop_post(s, false);
+ log_warning("%s failed to run spawn next executable: %s", s->meta.id, strerror(-r));
+
+ if (s->state == SOCKET_START_POST)
+ socket_enter_stop_pre(s, false);
else if (s->state == SOCKET_STOP_POST)
socket_enter_dead(s, false);
else
- socket_enter_stop_pre(s, false);
+ socket_enter_signal(s, SOCKET_FINAL_SIGTERM, false);
}
static int socket_start(Unit *u) {
s->state == SOCKET_STOP_PRE_SIGKILL ||
s->state == SOCKET_STOP_PRE_SIGTERM ||
s->state == SOCKET_STOP_POST ||
- s->state == SOCKET_STOP_POST_SIGTERM ||
- s->state == SOCKET_STOP_POST_SIGKILL)
+ s->state == SOCKET_FINAL_SIGTERM ||
+ s->state == SOCKET_FINAL_SIGKILL)
return -EAGAIN;
if (s->state == SOCKET_START_PRE ||
s->state == SOCKET_STOP_PRE_SIGTERM ||
s->state == SOCKET_STOP_PRE_SIGKILL ||
s->state == SOCKET_STOP_POST ||
- s->state == SOCKET_STOP_POST_SIGTERM ||
- s->state == SOCKET_STOP_POST_SIGTERM)
+ s->state == SOCKET_FINAL_SIGTERM ||
+ s->state == SOCKET_FINAL_SIGTERM)
return 0;
assert(s->state == SOCKET_LISTENING || s->state == SOCKET_RUNNING);
return state_translation_table[SOCKET(u)->state];
}
+static const char *socket_sub_state_to_string(Unit *u) {
+ assert(u);
+
+ return state_string_table[SOCKET(u)->state];
+}
+
static void socket_fd_event(Unit *u, int fd, uint32_t events, Watch *w) {
Socket *s = SOCKET(u);
assert(s);
- log_debug("Incoming traffic on %s", unit_id(u));
+ log_debug("Incoming traffic on %s", u->meta.id);
if (events != EPOLLIN)
socket_enter_stop_pre(s, false);
exec_status_fill(&s->control_command->exec_status, pid, code, status);
s->control_pid = 0;
- log_debug("%s control process exited, code=%s status=%i", unit_id(u), sigchld_code_to_string(code), status);
+ log_debug("%s control process exited, code=%s status=%i", u->meta.id, sigchld_code_to_string(code), status);
- if (s->control_command->command_next &&
- (success || (s->state == SOCKET_STOP_PRE || s->state == SOCKET_STOP_POST))) {
- log_debug("%s running next command for the state %s", unit_id(u), state_string_table[s->state]);
+ if (s->control_command->command_next && success) {
+ log_debug("%s running next command for state %s", u->meta.id, state_string_table[s->state]);
socket_run_next(s, success);
} else {
/* No further commands for this step, so let's figure
* out what to do next */
- log_debug("%s got final SIGCHLD for state %s", unit_id(u), state_string_table[s->state]);
+ log_debug("%s got final SIGCHLD for state %s", u->meta.id, state_string_table[s->state]);
switch (s->state) {
if (success)
socket_enter_start_post(s);
else
- socket_enter_stop_pre(s, false);
+ socket_enter_signal(s, SOCKET_FINAL_SIGTERM, false);
break;
case SOCKET_START_POST:
break;
case SOCKET_STOP_POST:
- case SOCKET_STOP_POST_SIGTERM:
- case SOCKET_STOP_POST_SIGKILL:
+ case SOCKET_FINAL_SIGTERM:
+ case SOCKET_FINAL_SIGKILL:
socket_enter_dead(s, success);
break;
switch (s->state) {
case SOCKET_START_PRE:
+ log_warning("%s starting timed out. Terminating.", u->meta.id);
+ socket_enter_signal(s, SOCKET_FINAL_SIGTERM, false);
+
case SOCKET_START_POST:
- log_warning("%s starting timed out. Stopping.", unit_id(u));
+ log_warning("%s starting timed out. Stopping.", u->meta.id);
socket_enter_stop_pre(s, false);
break;
case SOCKET_STOP_PRE:
- log_warning("%s stopping timed out. Terminating.", unit_id(u));
+ log_warning("%s stopping timed out. Terminating.", u->meta.id);
socket_enter_signal(s, SOCKET_STOP_PRE_SIGTERM, false);
break;
case SOCKET_STOP_PRE_SIGTERM:
- log_warning("%s stopping timed out. Killing.", unit_id(u));
+ log_warning("%s stopping timed out. Killing.", u->meta.id);
socket_enter_signal(s, SOCKET_STOP_PRE_SIGKILL, false);
break;
case SOCKET_STOP_PRE_SIGKILL:
- log_warning("%s still around after SIGKILL. Ignoring.", unit_id(u));
+ log_warning("%s still around after SIGKILL. Ignoring.", u->meta.id);
socket_enter_stop_post(s, false);
break;
case SOCKET_STOP_POST:
- log_warning("%s stopping timed out (2). Terminating.", unit_id(u));
- socket_enter_signal(s, SOCKET_STOP_POST_SIGTERM, false);
+ log_warning("%s stopping timed out (2). Terminating.", u->meta.id);
+ socket_enter_signal(s, SOCKET_FINAL_SIGTERM, false);
break;
- case SOCKET_STOP_POST_SIGTERM:
- log_warning("%s stopping timed out (2). Killing.", unit_id(u));
- socket_enter_signal(s, SOCKET_STOP_POST_SIGKILL, false);
+ case SOCKET_FINAL_SIGTERM:
+ log_warning("%s stopping timed out (2). Killing.", u->meta.id);
+ socket_enter_signal(s, SOCKET_FINAL_SIGKILL, false);
break;
- case SOCKET_STOP_POST_SIGKILL:
- log_warning("%s still around after SIGKILL (2). Entering maintainance mode.", unit_id(u));
+ case SOCKET_FINAL_SIGKILL:
+ log_warning("%s still around after SIGKILL (2). Entering maintainance mode.", u->meta.id);
socket_enter_dead(s, false);
break;
/* The service is dead. Dang. */
if (s->state == SOCKET_RUNNING) {
- log_debug("%s got notified about service death.", unit_id(UNIT(s)));
+ log_debug("%s got notified about service death.", s->meta.id);
socket_enter_listening(s);
}
}
.stop = socket_stop,
.active_state = socket_active_state,
+ .sub_state_to_string = socket_sub_state_to_string,
.fd_event = socket_fd_event,
.sigchld_event = socket_sigchld_event,
~ianmdlvl / elogind.git / blobdiff