diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2016-03-03 09:20:34 +0100 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2016-03-03 09:20:34 +0100 |
| commit | 5be72a7a3b4d8cd7d25195a5b72774dd62bbe9c5 (patch) | |
| tree | 0e5de449848778a383f4d791a3818e62b14a3acf | |
| parent | 4f2e685a773a542016ba8a8377847cd410cd150d (diff) | |
| download | NetworkManager-bg/logging-messages.tar.gz | |
dnsmasq-manager: use logging helpersbg/logging-messages
| -rw-r--r-- | src/dnsmasq-manager/nm-dnsmasq-manager.c | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.c b/src/dnsmasq-manager/nm-dnsmasq-manager.c index 9e388acfb9..a062e2f511 100644 --- a/src/dnsmasq-manager/nm-dnsmasq-manager.c +++ b/src/dnsmasq-manager/nm-dnsmasq-manager.c @@ -34,6 +34,13 @@ #include "NetworkManagerUtils.h" #include "nm-core-internal.h" +#define _NMLOG(level, ...) \ + G_STMT_START { \ + nm_log ((level), LOGD_SHARING, \ + "dnsmasq-manager: " _NM_UTILS_MACRO_FIRST(__VA_ARGS__) \ + _NM_UTILS_MACRO_REST(__VA_ARGS__)); \ + } G_STMT_END + typedef struct { char *iface; char *pidfile; @@ -181,7 +188,7 @@ dm_exit_code (guint dm_exit_status) break; } - nm_log_warn (LOGD_SHARING, "dnsmasq exited with error: %s (%d)", msg, dm_exit_status); + _LOGW ("dnsmasq exited with error: %s (%d)", msg, dm_exit_status); } static void @@ -196,11 +203,11 @@ dm_watch_cb (GPid pid, gint status, gpointer user_data) if (err != 0) dm_exit_code (err); } else if (WIFSTOPPED (status)) { - nm_log_warn (LOGD_SHARING, "dnsmasq stopped unexpectedly with signal %d", WSTOPSIG (status)); + _LOGW ("dnsmasq stopped unexpectedly with signal %d", WSTOPSIG (status)); } else if (WIFSIGNALED (status)) { - nm_log_warn (LOGD_SHARING, "dnsmasq died with signal %d", WTERMSIG (status)); + _LOGW ("dnsmasq died with signal %d", WTERMSIG (status)); } else { - nm_log_warn (LOGD_SHARING, "dnsmasq died from an unknown cause"); + _LOGW ("dnsmasq died from an unknown cause"); } priv->pid = 0; @@ -269,7 +276,7 @@ create_dm_cmd_line (const char *iface, NM_MANAGER_ERROR, NM_MANAGER_ERROR_FAILED, error_desc); - nm_log_warn (LOGD_SHARING, "Failed to find DHCP address ranges: %s", error_desc); + _LOGW ("failed to find DHCP address ranges: %s", error_desc); g_free (error_desc); nm_cmd_line_destroy (cmd); return NULL; @@ -361,10 +368,8 @@ nm_dnsmasq_manager_start (NMDnsMasqManager *manager, g_ptr_array_add (dm_cmd->array, NULL); - nm_log_info (LOGD_SHARING, "Starting dnsmasq..."); - - nm_log_dbg (LOGD_SHARING, "Command line: %s", - (cmd_str = nm_cmd_line_to_str (dm_cmd))); + _LOGI ("starting dnsmasq..."); + _LOGD ("command line: %s", (cmd_str = nm_cmd_line_to_str (dm_cmd))); priv->pid = 0; if (!g_spawn_async (NULL, (char **) dm_cmd->array->pdata, NULL, @@ -374,7 +379,7 @@ nm_dnsmasq_manager_start (NMDnsMasqManager *manager, goto out; } - nm_log_dbg (LOGD_SHARING, "dnsmasq started with pid %d", priv->pid); + _LOGD ("dnsmasq started with pid %d", priv->pid); priv->dm_watch_id = g_child_watch_add (priv->pid, (GChildWatchFunc) dm_watch_cb, manager); |