aboutgitcodebugslistschat
path: root/log.c
diff options
context:
space:
mode:
authorLaine Stump <laine@redhat.com>2023-02-15 03:24:29 -0500
committerStefano Brivio <sbrivio@redhat.com>2023-02-16 17:31:42 +0100
commit193385bd2f004a35abe4ef0870b3b482cd1f7919 (patch)
tree3d3618036879946540682bb314d1bc0a050e664a /log.c
parentdccc2ff774952274f94d94d78235602b84114c2e (diff)
downloadpasst-193385bd2f004a35abe4ef0870b3b482cd1f7919.tar
passt-193385bd2f004a35abe4ef0870b3b482cd1f7919.tar.gz
passt-193385bd2f004a35abe4ef0870b3b482cd1f7919.tar.bz2
passt-193385bd2f004a35abe4ef0870b3b482cd1f7919.tar.lz
passt-193385bd2f004a35abe4ef0870b3b482cd1f7919.tar.xz
passt-193385bd2f004a35abe4ef0870b3b482cd1f7919.tar.zst
passt-193385bd2f004a35abe4ef0870b3b482cd1f7919.zip
log to stderr until process is daemonized, even if a log file is set
Once a log file (specified on the commandline) is opened, the logging functions will stop sending error logs to stderr, which is annoying if passt has been started by another process that wants to collect error messages from stderr so it can report why passt failed to start. It would be much nicer if passt continued sending all log messages to stderr until it daemonizes itself (at which point the process that started passt can assume that it was started successfully). The system log mask is set to LOG_EMERG when the process starts, and we're already using that to do "special" logging during the period from process start until the log level requested on the commandline is processed (setting the log mask to something else). This period *almost* matches with "the time before the process is daemonized"; if we just delay setting the log mask a tiny bit, then it will match exactly, and we can use it to determine if we need to send log messages to stderr even when a log file has been specified and opened. This patch delays the setting of the log mask until immediately before the call to __daemon(). It also modifies logfn() slightly, so that it will log to stderr any time log mask is LOG_EMERG, even if a log file has been opened. Signed-off-by: Laine Stump <laine@redhat.com> Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Diffstat (limited to 'log.c')
-rw-r--r--log.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/log.c b/log.c
index 468c730..6dc6673 100644
--- a/log.c
+++ b/log.c
@@ -66,8 +66,8 @@ void name(const char *format, ...) { \
va_end(args); \
} \
\
- if ((setlogmask(0) & LOG_MASK(LOG_DEBUG) || \
- setlogmask(0) == LOG_MASK(LOG_EMERG)) && log_file == -1) { \
+ if ((setlogmask(0) & LOG_MASK(LOG_DEBUG) && log_file == -1) || \
+ setlogmask(0) == LOG_MASK(LOG_EMERG)) { \
va_start(args, format); \
(void)vfprintf(stderr, format, args); \
va_end(args); \