diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/libnm-log-core/nm-logging.c | 12 | ||||
| -rw-r--r-- | src/libnm-log-core/nm-logging.h | 1 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/libnm-log-core/nm-logging.c b/src/libnm-log-core/nm-logging.c index 6d2c085eee..da82cd0238 100644 --- a/src/libnm-log-core/nm-logging.c +++ b/src/libnm-log-core/nm-logging.c @@ -75,6 +75,7 @@ G_STATIC_ASSERT(sizeof(NMLogDomain) >= sizeof(guint64)); /*****************************************************************************/ typedef enum { + LOG_BACKEND_NONE, LOG_BACKEND_GLIB, LOG_BACKEND_SYSLOG, LOG_BACKEND_JOURNAL, @@ -794,6 +795,8 @@ _nm_log_impl(const char *file, case LOG_BACKEND_SYSLOG: syslog(nm_log_level_desc[level].syslog_level, MESSAGE_FMT, MESSAGE_ARG(g->prefix, tv, msg)); break; + case LOG_BACKEND_NONE: + break; default: g_log(syslog_identifier_domain(g->syslog_identifier), nm_log_level_desc[level].g_log_level, @@ -867,6 +870,8 @@ nm_log_handler(const char *log_domain, GLogLevelFlags level, const char *message g_printerr("%s%s\n", gl.imm.prefix, message ?: ""); switch (gl.imm.log_backend) { + case LOG_BACKEND_NONE: + break; #if SYSTEMD_JOURNAL case LOG_BACKEND_JOURNAL: { @@ -980,8 +985,11 @@ nm_logging_init(const char *logging_backend, gboolean debug) G_LOCK(log); + if (nm_streq(logging_backend, NM_LOG_CONFIG_BACKEND_NONE)) { + x_log_backend = LOG_BACKEND_NONE; + } else #if SYSTEMD_JOURNAL - if (!nm_streq(logging_backend, NM_LOG_CONFIG_BACKEND_SYSLOG)) { + if (!nm_streq(logging_backend, NM_LOG_CONFIG_BACKEND_SYSLOG)) { x_log_backend = LOG_BACKEND_JOURNAL; /* We only log the monotonic-timestamp with structured logging (journal). @@ -1017,7 +1025,7 @@ nm_logging_init(const char *logging_backend, gboolean debug) "config: ignore deprecated logging backend 'debug', fallback to '%s'", logging_backend); - if (nm_streq(logging_backend, NM_LOG_CONFIG_BACKEND_SYSLOG)) { + if (NM_IN_STRSET(logging_backend, NM_LOG_CONFIG_BACKEND_SYSLOG, NM_LOG_CONFIG_BACKEND_NONE)) { /* good */ } else if (nm_streq(logging_backend, NM_LOG_CONFIG_BACKEND_JOURNAL)) { #if !SYSTEMD_JOURNAL diff --git a/src/libnm-log-core/nm-logging.h b/src/libnm-log-core/nm-logging.h index 8071967552..739473a1ad 100644 --- a/src/libnm-log-core/nm-logging.h +++ b/src/libnm-log-core/nm-logging.h @@ -16,6 +16,7 @@ #define NM_LOG_CONFIG_BACKEND_DEBUG "debug" #define NM_LOG_CONFIG_BACKEND_SYSLOG "syslog" #define NM_LOG_CONFIG_BACKEND_JOURNAL "journal" +#define NM_LOG_CONFIG_BACKEND_NONE "none" #define nm_log_err(domain, ...) nm_log(LOGL_ERR, (domain), NULL, NULL, __VA_ARGS__) #define nm_log_warn(domain, ...) nm_log(LOGL_WARN, (domain), NULL, NULL, __VA_ARGS__) |