aboutsummaryrefslogtreecommitdiff
path: root/log.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-02-05 18:54:16 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-02-05 18:54:16 +0000
commit82b8853f17b943901776eddcb857089384a61dda (patch)
treed9eb3ac6ef72ee3a7b69c7fa0f3d16e6f6f4d921 /log.c
parentmain: add --print-pid=FILE|FD (diff)
main: add --print-pid=FILE|FD
When specified, our PID is written to the specified file (or FD), after we've successfully started up.
Diffstat (limited to 'log.c')
-rw-r--r--log.c25
1 files changed, 15 insertions, 10 deletions
diff --git a/log.c b/log.c
index 6d6b9668..4962f012 100644
--- a/log.c
+++ b/log.c
@@ -12,15 +12,11 @@
#include <syslog.h>
static bool colorize = false;
-
-static void __attribute__((constructor))
-init(void)
-{
- colorize = isatty(STDERR_FILENO);
-}
+static bool do_syslog = true;
void
-log_init(enum log_facility syslog_facility, enum log_class syslog_level)
+log_init(enum log_colorize _colorize, bool _do_syslog,
+ enum log_facility syslog_facility, enum log_class syslog_level)
{
static const int facility_map[] = {
[LOG_FACILITY_USER] = LOG_USER,
@@ -34,14 +30,20 @@ log_init(enum log_facility syslog_facility, enum log_class syslog_level)
[LOG_CLASS_DEBUG] = LOG_DEBUG,
};
- openlog(NULL, /*LOG_PID*/0, facility_map[syslog_facility]);
- setlogmask(LOG_UPTO(level_map[syslog_level]));
+ colorize = _colorize == LOG_COLORIZE_NEVER ? false : _colorize == LOG_COLORIZE_ALWAYS ? true : isatty(STDERR_FILENO);
+ do_syslog = _do_syslog;
+
+ if (do_syslog) {
+ openlog(NULL, /*LOG_PID*/0, facility_map[syslog_facility]);
+ setlogmask(LOG_UPTO(level_map[syslog_level]));
+ }
}
void
log_deinit(void)
{
- closelog();
+ if (do_syslog)
+ closelog();
}
static void
@@ -85,6 +87,9 @@ _sys_log(enum log_class log_class, const char *module,
int lineno __attribute__((unused)),
const char *fmt, int sys_errno, va_list va)
{
+ if (!do_syslog)
+ return;
+
/* Map our log level to syslog's level */
int level = -1;
switch (log_class) {