summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2017-04-23 18:35:24 +0200
committerThomas Haller <thaller@redhat.com>2017-05-11 18:57:24 +0200
commit9160e3fb83a52ca904e89c16eb7f5cb39e9281b1 (patch)
tree34d98f65eba6533e67d392aa54dd07021ee7cbb3
parent636ce44f9f3d013365ba43518cf949065347f480 (diff)
downloadNetworkManager-9160e3fb83a52ca904e89c16eb7f5cb39e9281b1.tar.gz
hostname: change logging of hostname-mode
Don't log with level <info>. It's not important enough and only noise. Also, move the logging line outside of nm_policy_init(). At that point, the policy instance is not yet initialized (much), so we shouldn't use the logging macro _LOGD().
-rw-r--r--src/nm-policy.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/nm-policy.c b/src/nm-policy.c
index 36c05e1afa..19193e9cf6 100644
--- a/src/nm-policy.c
+++ b/src/nm-policy.c
@@ -2241,6 +2241,15 @@ nm_policy_get_activating_ip6_device (NMPolicy *self)
/*****************************************************************************/
+NM_UTILS_LOOKUP_STR_DEFINE_STATIC (_hostname_mode_to_string, NMPolicyHostnameMode,
+ NM_UTILS_LOOKUP_DEFAULT_NM_ASSERT ("unknown"),
+ NM_UTILS_LOOKUP_STR_ITEM (NM_POLICY_HOSTNAME_MODE_NONE, "none"),
+ NM_UTILS_LOOKUP_STR_ITEM (NM_POLICY_HOSTNAME_MODE_DHCP, "dhcp"),
+ NM_UTILS_LOOKUP_STR_ITEM (NM_POLICY_HOSTNAME_MODE_FULL, "full"),
+);
+
+/*****************************************************************************/
+
static void
get_property (GObject *object, guint prop_id,
GValue *value, GParamSpec *pspec)
@@ -2314,7 +2323,6 @@ nm_policy_init (NMPolicy *self)
else /* default - full mode */
priv->hostname_mode = NM_POLICY_HOSTNAME_MODE_FULL;
- _LOGI (LOGD_DNS, "hostname management mode: %s", hostname_mode ? hostname_mode : "default");
priv->devices = g_hash_table_new (NULL, NULL);
priv->ip6_prefix_delegations = g_array_new (FALSE, FALSE, sizeof (IP6PrefixDelegation));
g_array_set_clear_func (priv->ip6_prefix_delegations, clear_ip6_prefix_delegation);
@@ -2364,6 +2372,8 @@ constructed (GObject *object)
g_signal_connect (priv->settings, NM_SETTINGS_SIGNAL_AGENT_REGISTERED, (GCallback) secret_agent_registered, priv);
G_OBJECT_CLASS (nm_policy_parent_class)->constructed (object);
+
+ _LOGD (LOGD_DNS, "hostname-mode: %s", _hostname_mode_to_string (priv->hostname_mode));
}
NMPolicy *