colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dnsmasq: use _LOG() macros

Browse Source 
The _LOG*() macros based on _NMLOG() prefix each line with a
context. Since we no longer log the location of the logging line,
this is the more important.
This commit is contained in:
Thomas Haller
2016-03-22 16:41:22 +01:00
parent 3e66813db2
commit 3bcc0e5cea
1 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/dns-manager/nm-dns-dnsmasq.c
View File

@@ -46,7 +46,20 @@ typedef struct {
guint32 foo; guint32 foo;
} NMDnsDnsmasqPrivate; } NMDnsDnsmasqPrivate;
/*******************************************/ /*****************************************************************************/
#define _NMLOG_DOMAIN LOGD_DNS
#define _NMLOG_PREFIX_NAME "dnsmasq"
#define _NMLOG(level, ...) \
G_STMT_START { \
nm_log ((level), _NMLOG_DOMAIN, \
"%s[%p]: " _NM_UTILS_MACRO_FIRST(__VA_ARGS__), \
_NMLOG_PREFIX_NAME, \
(self) \
_NM_UTILS_MACRO_REST(__VA_ARGS__)); \
} G_STMT_END
/*****************************************************************************/
static gboolean static gboolean
add_ip4_config (GString *str, NMIP4Config *ip4, gboolean split) add_ip4_config (GString *str, NMIP4Config *ip4, gboolean split)
@@ -246,7 +259,7 @@ update (NMDnsPlugin *plugin,
dm_binary = nm_utils_find_helper ("dnsmasq", DNSMASQ_PATH, NULL); dm_binary = nm_utils_find_helper ("dnsmasq", DNSMASQ_PATH, NULL);
if (!dm_binary) { if (!dm_binary) {
nm_log_warn (LOGD_DNS, "Could not find dnsmasq binary"); _LOGW ("could not find dnsmasq binary");
return FALSE; return FALSE;
} }
@@ -283,7 +296,7 @@ update (NMDnsPlugin *plugin,
/* Write out the config file */ /* Write out the config file */
if (!g_file_set_contents (CONFFILE, conf->str, -1, &error)) { if (!g_file_set_contents (CONFFILE, conf->str, -1, &error)) {
nm_log_warn (LOGD_DNS, "Failed to write dnsmasq config file %s: %s", _LOGW ("failed to write dnsmasq config file %s: %s",
CONFFILE, CONFFILE,
error->message); error->message);
g_clear_error (&error); g_clear_error (&error);
@@ -291,8 +304,8 @@ update (NMDnsPlugin *plugin,
} }
ignored = chmod (CONFFILE, 0644); ignored = chmod (CONFFILE, 0644);
nm_log_dbg (LOGD_DNS, "dnsmasq local caching DNS configuration:"); _LOGD ("dnsmasq local caching DNS configuration:");
nm_log_dbg (LOGD_DNS, "%s", conf->str); _LOGD ("%s", conf->str);
argv[idx++] = dm_binary; argv[idx++] = dm_binary;
argv[idx++] = "--no-resolv"; /* Use only commandline */ argv[idx++] = "--no-resolv"; /* Use only commandline */
@@ -350,18 +363,17 @@ child_quit (NMDnsPlugin *plugin, gint status)
if (WIFEXITED (status)) { if (WIFEXITED (status)) {
err = WEXITSTATUS (status); err = WEXITSTATUS (status);
if (err) { if (err) {
nm_log_warn (LOGD_DNS, "dnsmasq exited with error: %s (%d)", _LOGW ("dnsmasq exited with error: %s (%d)",
dm_exit_code_to_msg (err), dm_exit_code_to_msg (err),
err); err);
} else } else
failed = FALSE; failed = FALSE;
} else if (WIFSTOPPED (status)) { } else if (WIFSTOPPED (status))
nm_log_warn (LOGD_DNS, "dnsmasq stopped unexpectedly with signal %d", WSTOPSIG (status)); _LOGW ("dnsmasq stopped unexpectedly with signal %d", WSTOPSIG (status));
} else if (WIFSIGNALED (status)) { else if (WIFSIGNALED (status))
nm_log_warn (LOGD_DNS, "dnsmasq died with signal %d", WTERMSIG (status)); _LOGW ("dnsmasq died with signal %d", WTERMSIG (status));
} else { else
nm_log_warn (LOGD_DNS, "dnsmasq died from an unknown cause"); _LOGW ("dnsmasq died from an unknown cause");
}
unlink (CONFFILE); unlink (CONFFILE);
if (failed) if (failed)