mirrors/passt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

log: Don't duplicate messages on stderr before daemonising

Browse source 
Now that logging functions force printing messages to stderr before
passt forks to background, we'll have duplicate messages when running
from an interactive terminal, or if --stderr is passed, because at
some point we set LOG_PERROR in our __openlog() wrapper.

We could defer setting LOG_PERROR, but that would change option
semantics in other, unexpected ways. We could force calling
passt_vsyslog() as long as the mask is set to LOG_EMERG, but that
complicates the logic in logging functions even further.

Go the easy way for now: don't force printing to stderr with
LOG_EMERG if LOG_PERROR is already set. We should seriously consider a
rework of those logging functions at this point.

Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Stefano Brivio 2023-02-15 12:47:48 +01:00
parent c9af6f92db
commit b4f13c2b18
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
log.c
View file

@ -44,6 +44,8 @@ static char log_header[BUFSIZ]; /* File header, written back on cuts */
static time_t log_start; /* Start timestamp */ static time_t log_start; /* Start timestamp */
int log_trace; /* --trace mode enabled */ int log_trace; /* --trace mode enabled */
#define BEFORE_DAEMON (setlogmask(0) == LOG_MASK(LOG_EMERG))
#define logfn(name, level, doexit) \ #define logfn(name, level, doexit) \
void name(const char *format, ...) { \ void name(const char *format, ...) { \
struct timespec tp; \ struct timespec tp; \
@ -56,8 +58,7 @@ void name(const char *format, ...) { \
tp.tv_nsec / (100L * 1000)); \ tp.tv_nsec / (100L * 1000)); \
} \ } \
\ \
if ((LOG_MASK(LOG_PRI(level)) & log_mask) || \ if ((LOG_MASK(LOG_PRI(level)) & log_mask) || BEFORE_DAEMON) { \
setlogmask(0) == LOG_MASK(LOG_EMERG)) { \
va_start(args, format); \ va_start(args, format); \
if (log_file != -1) \ if (log_file != -1) \
logfile_write(level, format, args); \ logfile_write(level, format, args); \
@ -67,7 +68,7 @@ void name(const char *format, ...) { \
} \ } \
\ \
if ((setlogmask(0) & LOG_MASK(LOG_DEBUG) && log_file == -1) || \ if ((setlogmask(0) & LOG_MASK(LOG_DEBUG) && log_file == -1) || \
setlogmask(0) == LOG_MASK(LOG_EMERG)) { \ (BEFORE_DAEMON && !(log_opt & LOG_PERROR))) { \
va_start(args, format); \ va_start(args, format); \
(void)vfprintf(stderr, format, args); \ (void)vfprintf(stderr, format, args); \
va_end(args); \ va_end(args); \