summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/log.c11
-rw-r--r--src/log.h1
2 files changed, 12 insertions, 0 deletions
diff --git a/src/log.c b/src/log.c
index bf2382dfaf..94fb823358 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 9d141dcdda..1d9a100eef 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;