From 9fae33d2c8fe968e99d882728c4d072419798716 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 9 Jun 2010 15:37:37 +0200 Subject: [PATCH 1/1] log: add null log target --- src/log.c | 11 +++++++++++ src/log.h | 1 + 2 files changed, 12 insertions(+) diff --git a/src/log.c b/src/log.c index bf2382dfa..94fb82335 100644 --- a/src/log.c +++ b/src/log.c @@ -162,6 +162,12 @@ int log_open(void) { * the fs. If we don't use /dev/kmsg we still keep it open, * because there is no reason to close it. */ + if (log_target == LOG_TARGET_NULL) { + log_close_syslog(); + log_close_console(); + return 0; + } + if (log_target == LOG_TARGET_SYSLOG_OR_KMSG || log_target == LOG_TARGET_SYSLOG) if ((r = log_open_syslog()) >= 0) { @@ -186,6 +192,7 @@ void log_set_target(LogTarget target) { assert(target < _LOG_TARGET_MAX); log_target = target; + log_open(); } void log_set_max_level(int level) { @@ -316,6 +323,9 @@ static int log_dispatch( int r = 0; + if (log_target == LOG_TARGET_NULL) + return 0; + do { char *e; int k; @@ -475,6 +485,7 @@ static const char *const log_target_table[] = { [LOG_TARGET_SYSLOG] = "syslog", [LOG_TARGET_KMSG] = "kmsg", [LOG_TARGET_SYSLOG_OR_KMSG] = "syslog-or-kmsg", + [LOG_TARGET_NULL] = "null" }; DEFINE_STRING_TABLE_LOOKUP(log_target, LogTarget); diff --git a/src/log.h b/src/log.h index 9d141dcdd..1d9a100ee 100644 --- a/src/log.h +++ b/src/log.h @@ -33,6 +33,7 @@ typedef enum LogTarget{ LOG_TARGET_KMSG, LOG_TARGET_SYSLOG, LOG_TARGET_SYSLOG_OR_KMSG, + LOG_TARGET_NULL, _LOG_TARGET_MAX, _LOG_TARGET_INVALID = -1 } LogTarget; -- 2.30.2