diff options
| author | Michael Biebl <biebl@debian.org> | 2018-04-23 18:01:04 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-04-23 18:01:04 +0200 |
| commit | d00e17d14b5df5f7fcba1a17f91edbb3180fbf64 (patch) | |
| tree | 2b16542fff332a3c38fb2191f7ae4d4795f66451 /src/nm-logging.c | |
| parent | 2e03b565aa24225ca4992797a5d563542b0b2bdd (diff) | |
| parent | f60117b41d5433be1b4a96d82cd11d0c3dce9b63 (diff) | |
Update upstream source from tag 'upstream/1.11.3'
Update to upstream version '1.11.3' with Debian dir a3a34e6c602cb81e76dc3c255c617e7f7ecfc11c
Diffstat (limited to 'src/nm-logging.c')
| -rw-r--r-- | src/nm-logging.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/nm-logging.c b/src/nm-logging.c index f19f0de1..11e05c31 100644 --- a/src/nm-logging.c +++ b/src/nm-logging.c @@ -663,7 +663,7 @@ _nm_log_impl (const char *file, NMLogDomain dom = dom_all & _nm_logging_enabled_state[level]; for (diter = &global.domain_desc[0]; diter->name; diter++) { - if (!NM_FLAGS_HAS (dom_all, diter->num)) + if (!NM_FLAGS_ANY (dom_all, diter->num)) continue; /* construct a list of all domains (not only the enabled ones). @@ -681,7 +681,7 @@ _nm_log_impl (const char *file, g_string_append (s_domain_all, diter->name); } - if (NM_FLAGS_HAS (dom, diter->num)) { + if (NM_FLAGS_ANY (dom, diter->num)) { if (i_domain > 0) { /* SYSLOG_FACILITY is specified multiple times for each domain that is actually enabled. */ _iovec_set_format_a (iov++, _MAX_LEN (30, diter->name), "SYSLOG_FACILITY=%s", diter->name); @@ -768,6 +768,9 @@ nm_log_handler (const gchar *log_domain, break; } + if (global.debug_stderr) + g_printerr ("%s%s\n", global.prefix, message ?: ""); + switch (global.log_backend) { #if SYSTEMD_JOURNAL case LOG_BACKEND_JOURNAL: |