From 4f8a5a65312e6bdca6bc2197c854dc539d93d01c Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Mon, 6 Feb 2023 15:47:19 +0100 Subject: [PATCH] Follw-up to 4894580, unbreak TTYs The TTY and log configuration is overloaded using a union in svc_t, so we cannot "reset" the log attribute on reload. In fact, a TTY should never be allowed to have a tty:anything set, so change the parser to ignore log options for ttys. Signed-off-by: Joachim Wiberg --- src/service.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/service.c b/src/service.c index 8b952452..fed4bcfc 100644 --- a/src/service.c +++ b/src/service.c @@ -1654,10 +1654,12 @@ int service_register(int type, char *cfg, struct rlimit rlimit[], char *file) parse_script("ready", ready_script, svc->ready_script, sizeof(svc->ready_script)); else memset(svc->ready_script, 0, sizeof(svc->ready_script)); - if (log) - parse_log(svc, log); - else - svc->log.enabled = 0; + if (!svc_is_tty(svc)) { + if (log) + parse_log(svc, log); + else + svc->log.enabled = 0; + } if (notify) { int type = parse_notify(notify);