From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by passt.top (Postfix, from userid 1000) id 359945A0053; Tue, 18 Jun 2024 09:14:27 +0200 (CEST) From: Stefano Brivio To: passt-dev@passt.top Subject: [PATCH v2 3/6] log, passt: Always print to stderr before initialisation is complete Date: Tue, 18 Jun 2024 09:14:24 +0200 Message-ID: <20240618071427.1544869-4-sbrivio@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240618071427.1544869-1-sbrivio@redhat.com> References: <20240618071427.1544869-1-sbrivio@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: OLJANJLFC4R7P4AYKOKALHM2H375HG56 X-Message-ID-Hash: OLJANJLFC4R7P4AYKOKALHM2H375HG56 X-MailFrom: sbrivio@passt.top X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Yalan Zhang , David Gibson X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: After commit 15001b39ef1d ("conf: set the log level much earlier"), we had a phase during initialisation when messages wouldn't be printed to standard error anymore. Commit f67238aa864d ("passt, log: Call __openlog() earlier, log to stderr until we detach") fixed that, but only for the case where no log files are given. If a log file is configured, vlogmsg() will not call passt_vsyslog(), but during initialisation, LOG_PERROR is set, so to avoid duplicated prints (which would result from passt_vsyslog() printing to stderr), we don't call fprintf() from vlogmsg() either. This is getting a bit too complicated. Instead of abusing LOG_PERROR, define an internal logging flag that clearly represents that we're not done with the initialisation phase yet. If this flag is not set, make sure we always print to stderr, if the log mask matches. Then, set LOG_PERROR only as we set this internal flag, to make sure we don't duplicate messages. Reported-by: Yalan Zhang Signed-off-by: Stefano Brivio --- log.c | 4 +++- log.h | 1 + passt.1 | 3 ++- passt.c | 17 ++++++++++------- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/log.c b/log.c index 05b7f80..5853496 100644 --- a/log.c +++ b/log.c @@ -45,6 +45,7 @@ static time_t log_start; /* Start timestamp */ int log_trace; /* --trace mode enabled */ bool log_conf_parsed; /* Logging options already parsed */ +bool log_daemon_ready; /* Daemonised, or ready in foreground */ void vlogmsg(int pri, const char *format, va_list ap) { @@ -70,7 +71,8 @@ void vlogmsg(int pri, const char *format, va_list ap) va_end(ap2); } - if (debug_print || (!log_conf_parsed && !(log_opt & LOG_PERROR))) { + if (debug_print || !log_conf_parsed || + (!log_daemon_ready && (log_mask & LOG_MASK(LOG_PRI(pri))))) { (void)vfprintf(stderr, format, ap); if (format[strlen(format)] != '\n') fprintf(stderr, "\n"); diff --git a/log.h b/log.h index 3dab284..1d6dd1d 100644 --- a/log.h +++ b/log.h @@ -30,6 +30,7 @@ void logmsg(int pri, const char *format, ...) extern int log_trace; extern bool log_conf_parsed; +extern bool log_daemon_ready; void trace_init(int enable); #define trace(...) \ diff --git a/passt.1 b/passt.1 index 3a23a43..31e528e 100644 --- a/passt.1 +++ b/passt.1 @@ -99,7 +99,8 @@ terminal, and to both system logger and standard error otherwise. .TP .BR \-l ", " \-\-log-file " " \fIPATH\fR -Log to file \fIPATH\fR, not to standard error, and not to the system logger. +Log to file \fIPATH\fR, not to standard error (once initialisation is complete), +and not to the system logger. .TP .BR \-\-log-size " " \fISIZE\fR diff --git a/passt.c b/passt.c index aa9648a..7436120 100644 --- a/passt.c +++ b/passt.c @@ -225,7 +225,7 @@ int main(int argc, char **argv) strncpy(argv0, argv[0], PATH_MAX - 1); name = basename(argv0); if (strstr(name, "pasta")) { - __openlog(log_name = "pasta", LOG_PERROR, LOG_DAEMON); + __openlog(log_name = "pasta", 0, LOG_DAEMON); sa.sa_handler = pasta_child_handler; if (sigaction(SIGCHLD, &sa, NULL)) { @@ -240,7 +240,7 @@ int main(int argc, char **argv) c.mode = MODE_PASTA; } else if (strstr(name, "passt")) { - __openlog(log_name = "passt", LOG_PERROR, LOG_DAEMON); + __openlog(log_name = "passt", 0, LOG_DAEMON); c.mode = MODE_PASST; } else { @@ -302,13 +302,16 @@ int main(int argc, char **argv) if (isolate_prefork(&c)) die("Failed to sandbox process, exiting"); - if (!c.foreground || (!c.force_stderr && !isatty(fileno(stderr)))) - __openlog(log_name, 0, LOG_DAEMON); - - if (!c.foreground) + if (!c.foreground) { __daemon(c.pidfile_fd, devnull_fd); - else + } else { + if (c.force_stderr || isatty(fileno(stderr))) + __openlog(log_name, LOG_PERROR, LOG_DAEMON); + pidfile_write(c.pidfile_fd, getpid()); + } + + log_daemon_ready = true; if (pasta_child_pid) kill(pasta_child_pid, SIGUSR1); -- 2.43.0