shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-24 21:34:08 +03:00
Code

service: if StandardInput=socket and StandardOutput=inherit imply socket for output, don't imply default output

Browse Source 
This is useful for inetd-style per-connection services, so that they
again can simply specify StandardOutput=socket to connect all three fds
to the socket.
This commit is contained in:
Lennart Poettering 2011-09-22 03:29:51 +02:00
parent a65f4aeb63
commit 4dfc092a71
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TODO
View File

@ -21,8 +21,6 @@ Features:
* https://bugzilla.redhat.com/show_bug.cgi?id=727068 * https://bugzilla.redhat.com/show_bug.cgi?id=727068
* for socket units don't inherit global stdout setting.
* internal restart counter for units (focus on auto-respawn) * internal restart counter for units (focus on auto-respawn)
* finer-grained auto-respawn settings (rate-limit) * finer-grained auto-respawn settings (rate-limit)
@ -102,8 +100,6 @@ Features:
* GC unreferenced jobs (such as .device jobs) * GC unreferenced jobs (such as .device jobs)
* avoid DefaultStandardOutput=syslog to have any effect on StandardInput=socket services
* cgroup_notify_empty(): recursively check groups up the tree, too * cgroup_notify_empty(): recursively check groups up the tree, too
* when failing to start a service due to ratelimiting, try again later, if restart=always is set * when failing to start a service due to ratelimiting, try again later, if restart=always is set

29
src/service.c
View File

@ -121,8 +121,6 @@ static void service_init(Unit *u) {
s->guess_main_pid = true; s->guess_main_pid = true;
exec_context_init(&s->exec_context); exec_context_init(&s->exec_context);
s->exec_context.std_output = u->meta.manager->default_std_output;
s->exec_context.std_error = u->meta.manager->default_std_error;
RATELIMIT_INIT(s->ratelimit, 10*USEC_PER_SEC, 5); RATELIMIT_INIT(s->ratelimit, 10*USEC_PER_SEC, 5);
@ -832,9 +830,10 @@ static int service_load_sysv_path(Service *s, const char *path) {
s->type = SERVICE_FORKING; s->type = SERVICE_FORKING;
s->remain_after_exit = !s->pid_file; s->remain_after_exit = !s->pid_file;
s->restart = SERVICE_RESTART_NO; s->restart = SERVICE_RESTART_NO;
s->exec_context.std_output =
(s->meta.manager->sysv_console || s->exec_context.std_input == EXEC_INPUT_TTY) if (s->meta.manager->sysv_console)
? EXEC_OUTPUT_TTY : s->meta.manager->default_std_output; s->exec_context.std_output = EXEC_OUTPUT_TTY;
s->exec_context.kill_mode = KILL_PROCESS; s->exec_context.kill_mode = KILL_PROCESS;
/* We use the long description only if /* We use the long description only if
@ -1100,6 +1099,24 @@ static int service_add_default_dependencies(Service *s) {
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_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true);
} }
static void service_fix_output(Service *s) {
assert(s);
/* If nothing has been explicitly configured, patch default
* output in. If input is socket/tty we avoid this however,
* since in that case we want output to default to the same
* place as we read input from. */
if (s->exec_context.std_error == EXEC_OUTPUT_INHERIT &&
s->exec_context.std_output == EXEC_OUTPUT_INHERIT &&
s->exec_context.std_input == EXEC_INPUT_NULL)
s->exec_context.std_error = s->meta.manager->default_std_error;
if (s->exec_context.std_output == EXEC_OUTPUT_INHERIT &&
s->exec_context.std_input == EXEC_INPUT_NULL)
s->exec_context.std_output = s->meta.manager->default_std_output;
}
static int service_load(Unit *u) { static int service_load(Unit *u) {
int r; int r;
Service *s = SERVICE(u); Service *s = SERVICE(u);
@ -1156,6 +1173,8 @@ static int service_load(Unit *u) {
if (s->meta.default_dependencies) if (s->meta.default_dependencies)
if ((r = service_add_default_dependencies(s)) < 0) if ((r = service_add_default_dependencies(s)) < 0)
return r; return r;
service_fix_output(s);
} }
return service_verify(s); return service_verify(s);