aboutgitcodebugslistschat
path: root/log.c
diff options
context:
space:
mode:
authorStefano Brivio <sbrivio@redhat.com>2024-06-14 19:00:27 +0200
committerStefano Brivio <sbrivio@redhat.com>2024-06-21 15:32:31 +0200
commit8c2f24a5604ad908d6d65b64bf7675e04e2d7277 (patch)
tree69138860d6e3d34be8b7bb0f61c13554fdccf94e /log.c
parentbca0fefa32e083ab46a49989f225ec34e7cdbb8c (diff)
downloadpasst-8c2f24a5604ad908d6d65b64bf7675e04e2d7277.tar
passt-8c2f24a5604ad908d6d65b64bf7675e04e2d7277.tar.gz
passt-8c2f24a5604ad908d6d65b64bf7675e04e2d7277.tar.bz2
passt-8c2f24a5604ad908d6d65b64bf7675e04e2d7277.tar.lz
passt-8c2f24a5604ad908d6d65b64bf7675e04e2d7277.tar.xz
passt-8c2f24a5604ad908d6d65b64bf7675e04e2d7277.tar.zst
passt-8c2f24a5604ad908d6d65b64bf7675e04e2d7277.zip
conf, log: Instead of abusing log levels, add log_conf_parsed flag
We currently use a LOG_EMERG log mask to represent the fact that we don't know yet what the mask resulting from configuration should be, before the command line is parsed. However, we have the necessity of representing another phase as well, that is, configuration is parsed but we didn't daemonise yet, or we're not ready for operation yet. The next patch will add that notion explicitly. Mapping these cases to further log levels isn't really practical. Introduce boolean log flags to represent them, instead of abusing log priorities. Signed-off-by: Stefano Brivio <sbrivio@redhat.com> Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'log.c')
-rw-r--r--log.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/log.c b/log.c
index aaf2beb..05b7f80 100644
--- a/log.c
+++ b/log.c
@@ -30,12 +30,9 @@
#include "util.h"
#include "passt.h"
-/* LOG_EARLY means we don't know yet: log everything. LOG_EMERG is unused */
-#define LOG_EARLY LOG_MASK(LOG_EMERG)
-
static int log_sock = -1; /* Optional socket to system logger */
static char log_ident[BUFSIZ]; /* Identifier string for openlog() */
-static int log_mask = LOG_EARLY; /* Current log priority mask */
+static int log_mask; /* Current log priority mask */
static int log_opt; /* Options for openlog() */
static int log_file = -1; /* Optional log file descriptor */
@@ -45,12 +42,13 @@ static size_t log_cut_size; /* Bytes to cut at start on rotation */
static char log_header[BUFSIZ]; /* File header, written back on cuts */
static time_t log_start; /* Start timestamp */
+
int log_trace; /* --trace mode enabled */
+bool log_conf_parsed; /* Logging options already parsed */
void vlogmsg(int pri, const char *format, va_list ap)
{
bool debug_print = (log_mask & LOG_MASK(LOG_DEBUG)) && log_file == -1;
- bool early_print = LOG_PRI(log_mask) == LOG_EARLY;
struct timespec tp;
if (debug_print) {
@@ -60,7 +58,7 @@ void vlogmsg(int pri, const char *format, va_list ap)
(long long int)tp.tv_nsec / (100L * 1000));
}
- if ((log_mask & LOG_MASK(LOG_PRI(pri))) || early_print) {
+ if ((log_mask & LOG_MASK(LOG_PRI(pri))) || !log_conf_parsed) {
va_list ap2;
va_copy(ap2, ap); /* Don't clobber ap, we need it again */
@@ -72,7 +70,7 @@ void vlogmsg(int pri, const char *format, va_list ap)
va_end(ap2);
}
- if (debug_print || (early_print && !(log_opt & LOG_PERROR))) {
+ if (debug_print || (!log_conf_parsed && !(log_opt & LOG_PERROR))) {
(void)vfprintf(stderr, format, ap);
if (format[strlen(format)] != '\n')
fprintf(stderr, "\n");