diff options
| author | Stefano Brivio <sbrivio@redhat.com> | 2023-02-15 12:47:48 +0100 |
|---|---|---|
| committer | Stefano Brivio <sbrivio@redhat.com> | 2023-02-16 17:32:30 +0100 |
| commit | b4f13c2b189c24ae1ef7fee562d5be7147efd477 (patch) | |
| tree | fa478406bed136525cad280ae7faf1dd2b71ad76 | |
| parent | c9af6f92db9f760e0b03a75bf688439e4aeab231 (diff) | |
| download | passt-b4f13c2b189c24ae1ef7fee562d5be7147efd477.tar passt-b4f13c2b189c24ae1ef7fee562d5be7147efd477.tar.gz passt-b4f13c2b189c24ae1ef7fee562d5be7147efd477.tar.bz2 passt-b4f13c2b189c24ae1ef7fee562d5be7147efd477.tar.lz passt-b4f13c2b189c24ae1ef7fee562d5be7147efd477.tar.xz passt-b4f13c2b189c24ae1ef7fee562d5be7147efd477.tar.zst passt-b4f13c2b189c24ae1ef7fee562d5be7147efd477.zip | |
log: Don't duplicate messages on stderr before daemonising
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>
| -rw-r--r-- | log.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -44,6 +44,8 @@ static char log_header[BUFSIZ]; /* File header, written back on cuts */ static time_t log_start; /* Start timestamp */ int log_trace; /* --trace mode enabled */ +#define BEFORE_DAEMON (setlogmask(0) == LOG_MASK(LOG_EMERG)) + #define logfn(name, level, doexit) \ void name(const char *format, ...) { \ struct timespec tp; \ @@ -56,8 +58,7 @@ void name(const char *format, ...) { \ tp.tv_nsec / (100L * 1000)); \ } \ \ - if ((LOG_MASK(LOG_PRI(level)) & log_mask) || \ - setlogmask(0) == LOG_MASK(LOG_EMERG)) { \ + if ((LOG_MASK(LOG_PRI(level)) & log_mask) || BEFORE_DAEMON) { \ va_start(args, format); \ if (log_file != -1) \ logfile_write(level, format, args); \ @@ -67,7 +68,7 @@ void name(const char *format, ...) { \ } \ \ 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); \ (void)vfprintf(stderr, format, args); \ va_end(args); \ |