From 5aa28473dd76c6c10c5e2e9d303250c8f8881e05 Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Sun, 18 Mar 2012 01:58:09 +0000 Subject: [PATCH] Sync OpenBSD patchset 1056: Redirect libevent logging to tmux's log. --- log.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/log.c b/log.c index c9e26a94..69b9a802 100644 --- a/log.c +++ b/log.c @@ -42,6 +42,13 @@ int log_level; void log_vwrite(int, const char *, va_list); __dead void log_vfatal(const char *, va_list); +/* Log callback for libevent. */ +void +log_event_cb(unused int severity, const char *msg) +{ + log_warnx(msg); +} + /* Open logging to tty. */ void log_open_tty(int level) @@ -51,6 +58,7 @@ log_open_tty(int level) setlinebuf(stderr); setlinebuf(stdout); + event_set_log_callback(log_event_cb); tzset(); } @@ -67,6 +75,7 @@ log_open_file(int level, const char *path) log_level = level; setlinebuf(log_file); + event_set_log_callback(log_event_cb); tzset(); } @@ -78,6 +87,8 @@ log_close(void) if (log_type == LOG_TYPE_FILE) fclose(log_file); + event_set_log_callback(NULL); + log_type = LOG_TYPE_OFF; }