aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2022-12-02 10:45:10 +0000
committerDaniel Eklöf <daniel@ekloef.se>2022-12-02 10:45:10 +0000
commitb43a41df6a5a72b22b6c16d5ac45d0d66a9d5207 (patch)
tree27c6051e43420c5a6dc5697cf2e01bfccacf69c9
parenturl-mode: tag cells after snapshot:ing the grid (diff)
log: don’t default to syslog enabled
Initialize the global ‘do_syslog’ variable to false. This ensures any log calls done before log_init() has been called (e.g. unit tests) doesn’t syslog anything. As a side effect, such log calls no longer open an implicit syslog file descriptor; this is how this “bug” was found: valgrind detected an unclosed file descriptor at exit. Finally, completely disable syslogging if log-level is “none”.
-rw-r--r--log.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/log.c b/log.c
index b93b2cde..360ca1c0 100644
--- a/log.c
+++ b/log.c
@@ -15,7 +15,7 @@
#include "xsnprintf.h"
static bool colorize = false;
-static bool do_syslog = true;
+static bool do_syslog = false;
static enum log_class log_level = LOG_CLASS_NONE;
static const struct {
@@ -45,8 +45,13 @@ log_init(enum log_colorize _colorize, bool _do_syslog,
log_level = _log_level;
int slvl = log_level_map[_log_level].syslog_equivalent;
- if (do_syslog && slvl != -1) {
+ if (slvl < 0)
+ do_syslog = false;
+
+ if (do_syslog) {
openlog(NULL, /*LOG_PID*/0, facility_map[syslog_facility]);
+
+ xassert(slvl >= 0);
setlogmask(LOG_UPTO(slvl));
}
}