#include "unit.h"
#include "socket.h"
#include "log.h"
+#include "load-dropin.h"
+#include "load-fragment.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"
};
+static void socket_unwatch_control_pid(Socket *s) {
+ assert(s);
+
+ if (s->control_pid <= 0)
+ return;
+
+ unit_unwatch_pid(UNIT(s), s->control_pid);
+ s->control_pid = 0;
+}
+
static void socket_done(Unit *u) {
Socket *s = SOCKET(u);
SocketPort *p;
}
exec_context_done(&s->exec_context);
- exec_command_free_array(s->exec_command, _SOCKET_EXEC_MAX);
+ exec_command_free_array(s->exec_command, _SOCKET_EXEC_COMMAND_MAX);
s->control_command = NULL;
- if (s->control_pid > 0) {
- unit_unwatch_pid(u, s->control_pid);
- s->control_pid = 0;
- }
+ socket_unwatch_control_pid(s);
s->service = NULL;
free(s->bind_to_device);
+ s->bind_to_device = NULL;
unit_unwatch_timer(u, &s->timer_watch);
}
-static int socket_init(Unit *u) {
+static void socket_init(Unit *u) {
Socket *s = SOCKET(u);
- char *t;
- int r;
- /* First, reset everything to the defaults, in case this is a
- * reload */
+ assert(u);
+ assert(u->meta.load_state == UNIT_STUB);
s->state = 0;
s->timer_watch.type = WATCH_INVALID;
s->bind_ipv6_only = false;
s->backlog = SOMAXCONN;
s->timeout_usec = DEFAULT_TIMEOUT_USEC;
+ s->directory_mode = 0755;
+ s->socket_mode = 0666;
+ s->kill_mode = 0;
+ s->failure = false;
+ s->control_pid = 0;
+ s->service = NULL;
exec_context_init(&s->exec_context);
+}
- if ((r = unit_load_fragment_and_dropin(u)) <= 0) {
- if (r == 0)
- r = -ENOENT;
- goto fail;
- }
+static int socket_load(Unit *u) {
+ Socket *s = SOCKET(u);
+ int r;
- if (!(t = unit_name_change_suffix(unit_id(u), ".service"))) {
- r = -ENOMEM;
- goto fail;
- }
+ assert(u);
+ assert(u->meta.load_state == UNIT_STUB);
- r = manager_load_unit(u->meta.manager, t, (Unit**) &s->service);
- free(t);
+ if ((r = unit_load_fragment_and_dropin(u)) < 0)
+ return r;
- if (r < 0)
- goto fail;
+ /* This is a new unit? Then let's add in some extras */
+ if (u->meta.load_state == UNIT_LOADED) {
- if ((r = unit_add_dependency(u, UNIT_BEFORE, UNIT(s->service))) < 0)
- goto fail;
+ if ((r = unit_load_related_unit(u, ".service", (Unit**) &s->service)))
+ return r;
- return 0;
+ if ((r = unit_add_dependency(u, UNIT_BEFORE, UNIT(s->service))) < 0)
+ return r;
-fail:
- socket_done(u);
- return r;
+ if ((r = unit_add_exec_dependencies(u, &s->exec_context)) < 0)
+ return r;
+
+ if ((r = unit_add_default_cgroup(u)) < 0)
+ return r;
+ }
+
+ return 0;
}
static const char* listen_lookup(int type) {
static void socket_dump(Unit *u, FILE *f, const char *prefix) {
- static const char* const command_table[_SOCKET_EXEC_MAX] = {
+ static const char* const command_table[_SOCKET_EXEC_COMMAND_MAX] = {
[SOCKET_EXEC_START_PRE] = "StartPre",
[SOCKET_EXEC_START_POST] = "StartPost",
[SOCKET_EXEC_STOP_PRE] = "StopPre",
fprintf(f,
"%sSocket State: %s\n"
"%sBindIPv6Only: %s\n"
- "%sBacklog: %u\n",
+ "%sBacklog: %u\n"
+ "%sKillMode: %s\n"
+ "%sSocketMode: %04o\n"
+ "%sDirectoryMode: %04o\n",
prefix, state_string_table[s->state],
prefix, yes_no(s->bind_ipv6_only),
- prefix, s->backlog);
+ prefix, s->backlog,
+ prefix, kill_mode_to_string(s->kill_mode),
+ prefix, s->socket_mode,
+ prefix, s->directory_mode);
+
+ if (s->control_pid > 0)
+ fprintf(f,
+ "%sControl PID: %llu\n",
+ prefix, (unsigned long long) s->control_pid);
if (s->bind_to_device)
fprintf(f,
exec_context_dump(&s->exec_context, f, prefix);
- for (c = 0; c < _SOCKET_EXEC_MAX; c++) {
+ for (c = 0; c < _SOCKET_EXEC_COMMAND_MAX; c++) {
if (!s->exec_command[c])
continue;
if (p->type == SOCKET_SOCKET) {
- if ((r = socket_address_listen(&p->address, s->backlog, s->bind_ipv6_only, s->bind_to_device, &p->fd)) < 0)
+ if ((r = socket_address_listen(
+ &p->address,
+ s->backlog,
+ s->bind_ipv6_only,
+ s->bind_to_device,
+ s->directory_mode,
+ s->socket_mode,
+ &p->fd)) < 0)
goto rollback;
} else {
struct stat st;
assert(p->type == SOCKET_FIFO);
- if (mkfifo(p->path, 0666 & ~s->exec_context.umask) < 0 && errno != EEXIST) {
+ mkdir_parents(p->path, s->directory_mode);
+
+ if (mkfifo(p->path, s->socket_mode) < 0 && errno != EEXIST) {
r = -errno;
goto rollback;
}
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);
-
- if (state != SOCKET_START_PRE &&
- state != SOCKET_START_POST &&
- state != SOCKET_STOP_PRE &&
- state != SOCKET_STOP_PRE_SIGTERM &&
- state != SOCKET_STOP_PRE_SIGKILL &&
- state != SOCKET_STOP_POST &&
- state != SOCKET_STOP_POST_SIGTERM &&
- state != SOCKET_STOP_POST_SIGKILL)
- if (s->control_pid > 0) {
- unit_unwatch_pid(UNIT(s), s->control_pid);
- s->control_pid = 0;
- }
-
- if (state != SOCKET_START_PRE &&
- state != SOCKET_START_POST &&
- state != SOCKET_STOP_PRE &&
- state != SOCKET_STOP_POST)
+ socket_unwatch_control_pid(s);
s->control_command = NULL;
+ }
if (state != SOCKET_START_POST &&
state != SOCKET_LISTENING &&
if (state != SOCKET_LISTENING)
socket_unwatch_fds(s);
- log_debug("%s changed %s → %s", unit_id(UNIT(s)), state_string_table[old_state], state_string_table[state]);
+ if (state != old_state)
+ log_debug("%s changed %s → %s", unit_id(UNIT(s)), 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, bool timeout, pid_t *_pid) {
+static int socket_spawn(Socket *s, ExecCommand *c, pid_t *_pid) {
pid_t pid;
int r;
assert(c);
assert(_pid);
- if (timeout) {
- if ((r = unit_watch_timer(UNIT(s), s->timeout_usec, &s->timer_watch)) < 0)
- goto fail;
- } else
- unit_unwatch_timer(UNIT(s), &s->timer_watch);
+ 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, &pid)) < 0)
+ if ((r = exec_spawn(c,
+ &s->exec_context,
+ NULL, 0,
+ true,
+ true,
+ UNIT(s)->meta.manager->confirm_spawn,
+ UNIT(s)->meta.cgroup_bondings,
+ &pid)) < 0)
goto fail;
if ((r = unit_watch_pid(UNIT(s), pid)) < 0)
return 0;
fail:
- if (timeout)
- unit_unwatch_timer(UNIT(s), &s->timer_watch);
+ unit_unwatch_timer(UNIT(s), &s->timer_watch);
return r;
}
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);
if (!success)
s->failure = true;
- if ((s->control_command = s->exec_command[SOCKET_EXEC_STOP_POST]))
- if ((r = socket_spawn(s, s->control_command, true, &s->control_pid)) < 0)
- goto fail;
+ socket_unwatch_control_pid(s);
- socket_set_state(s, SOCKET_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;
- 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);
+ 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;
+ if (s->kill_mode != KILL_NONE) {
+ int sig = (state == SOCKET_STOP_PRE_SIGTERM || state == SOCKET_FINAL_SIGTERM) ? SIGTERM : SIGKILL;
- sig = (state == SOCKET_STOP_PRE_SIGTERM || state == SOCKET_STOP_POST_SIGTERM) ? SIGTERM : SIGKILL;
+ if (s->kill_mode == KILL_CONTROL_GROUP) {
- if (kill(s->control_pid, sig) < 0 && errno != ESRCH) {
- r = -errno;
- goto fail;
+ if ((r = cgroup_bonding_kill_list(UNIT(s)->meta.cgroup_bondings, sig)) < 0) {
+ if (r != -EAGAIN && r != -ESRCH)
+ goto fail;
+ } else
+ sent = true;
}
+
+ 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;
if (!success)
s->failure = true;
- if ((s->control_command = s->exec_command[SOCKET_EXEC_STOP_PRE]))
- if ((r = socket_spawn(s, s->control_command, true, &s->control_pid)) < 0)
- goto fail;
+ socket_unwatch_control_pid(s);
- socket_set_state(s, SOCKET_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;
- if (!s->control_command)
+ socket_set_state(s, SOCKET_STOP_PRE);
+ } else
socket_enter_stop_post(s, true);
return;
goto fail;
}
- if ((s->control_command = s->exec_command[SOCKET_EXEC_START_POST]))
- if ((r = socket_spawn(s, s->control_command, true, &s->control_pid)) < 0) {
+ socket_unwatch_control_pid(s);
+
+ 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));
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;
int r;
assert(s);
- if ((s->control_command = s->exec_command[SOCKET_EXEC_START_PRE]))
- if ((r = socket_spawn(s, s->control_command, true, &s->control_pid)) < 0)
- goto fail;
+ socket_unwatch_control_pid(s);
- socket_set_state(s, SOCKET_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;
- if (!s->control_command)
+ socket_set_state(s, SOCKET_START_PRE);
+ } else
socket_enter_start_post(s);
return;
fail:
log_warning("%s failed to queue socket startup job: %s", unit_id(UNIT(s)), strerror(-r));
- socket_enter_dead(s, false);
+ socket_enter_stop_pre(s, false);
}
static void socket_run_next(Socket *s, bool success) {
if (!success)
s->failure = true;
+ socket_unwatch_control_pid(s);
+
s->control_command = s->control_command->command_next;
- if ((r = socket_spawn(s, s->control_command, true, &s->control_pid)) < 0)
+ if ((r = socket_spawn(s, s->control_command, &s->control_pid)) < 0)
goto fail;
return;
fail:
- if (s->state == SOCKET_STOP_PRE)
- socket_enter_stop_post(s, false);
+ log_warning("%s failed to run spawn next executable: %s", unit_id(UNIT(s)), 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 ||
if (s->service->meta.load_state != UNIT_LOADED)
return -ENOENT;
+ /* If the service is alredy actvie we cannot start the
+ * socket */
+ if (s->service->state != SERVICE_DEAD &&
+ s->service->state != SERVICE_MAINTAINANCE &&
+ s->service->state != SERVICE_AUTO_RESTART)
+ return -EBUSY;
+
assert(s->state == SOCKET_DEAD || s->state == SOCKET_MAINTAINANCE);
s->failure = false;
s->state == SOCKET_START_POST)
return -EAGAIN;
+ /* Already on it */
+ if (s->state == SOCKET_STOP_PRE ||
+ s->state == SOCKET_STOP_PRE_SIGTERM ||
+ s->state == SOCKET_STOP_PRE_SIGKILL ||
+ s->state == SOCKET_STOP_POST ||
+ s->state == SOCKET_FINAL_SIGTERM ||
+ s->state == SOCKET_FINAL_SIGTERM)
+ return 0;
+
assert(s->state == SOCKET_LISTENING || s->state == SOCKET_RUNNING);
socket_enter_stop_pre(s, true);
log_debug("%s control process exited, code=%s status=%i", unit_id(u), sigchld_code_to_string(code), status);
- if (s->control_command->command_next &&
- (success || (s->state == SOCKET_EXEC_STOP_PRE || s->state == SOCKET_EXEC_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", unit_id(u), state_string_table[s->state]);
socket_run_next(s, success);
} else {
/* No further commands for this step, so let's figure
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;
assert(s);
assert(elapsed == 1);
-
assert(w == &s->timer_watch);
switch (s->state) {
case SOCKET_START_PRE:
+ log_warning("%s starting timed out. Terminating.", unit_id(u));
+ socket_enter_signal(s, SOCKET_FINAL_SIGTERM, false);
+
case SOCKET_START_POST:
- log_warning("%s operation timed out. Stopping.", unit_id(u));
+ log_warning("%s starting timed out. Stopping.", unit_id(u));
socket_enter_stop_pre(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);
+ socket_enter_signal(s, SOCKET_FINAL_SIGTERM, false);
break;
- case SOCKET_STOP_POST_SIGTERM:
+ case SOCKET_FINAL_SIGTERM:
log_warning("%s stopping timed out (2). Killing.", unit_id(u));
- socket_enter_signal(s, SOCKET_STOP_POST_SIGKILL, false);
+ socket_enter_signal(s, SOCKET_FINAL_SIGKILL, false);
break;
- case SOCKET_STOP_POST_SIGKILL:
+ case SOCKET_FINAL_SIGKILL:
log_warning("%s still around after SIGKILL (2). Entering maintainance mode.", unit_id(u));
socket_enter_dead(s, false);
break;
.suffix = ".socket",
.init = socket_init,
+ .load = socket_load,
.done = socket_done,
.dump = socket_dump,