summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2015-04-17 13:47:10 +0200
committerThomas Haller <thaller@redhat.com>2015-04-17 15:48:48 +0200
commit0693eb6b8b6e7e901d59722c540bbeb2a4e3b077 (patch)
tree16fd0d67ce5a510ab38fa9114fa4b8230397bcdd
parentbdd522f3cb89220663fe780131faf7d8d6d10cf7 (diff)
downloadNetworkManager-0693eb6b8b6e7e901d59722c540bbeb2a4e3b077.tar.gz
core/logging: reduce info logging messages for devices
https://bugzilla.redhat.com/show_bug.cgi?id=1212196
-rw-r--r--src/devices/nm-device.c8
-rw-r--r--src/nm-manager.c8
2 files changed, 10 insertions, 6 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 888aa339aa..8ee58ebcc9 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -493,7 +493,7 @@ nm_device_dbus_export (NMDevice *self)
g_return_if_fail (priv->path == NULL);
priv->path = g_strdup_printf ("/org/freedesktop/NetworkManager/Devices/%d", devcount++);
- _LOGI (LOGD_DEVICE, "exported as %s", priv->path);
+ _LOGD (LOGD_DEVICE, "exported as %s", priv->path);
nm_dbus_manager_register_object (nm_dbus_manager_get (), priv->path, self);
}
@@ -7528,9 +7528,9 @@ nm_device_cleanup (NMDevice *self, NMDeviceStateReason reason, gboolean deconfig
g_return_if_fail (NM_IS_DEVICE (self));
if (reason == NM_DEVICE_STATE_REASON_NOW_MANAGED)
- _LOGI (LOGD_DEVICE, "preparing device");
+ _LOGD (LOGD_DEVICE, "preparing device");
else
- _LOGI (LOGD_DEVICE, "deactivating device (reason '%s') [%d]", reason_to_string (reason), reason);
+ _LOGD (LOGD_DEVICE, "deactivating device (reason '%s') [%d]", reason_to_string (reason), reason);
/* Save whether or not we tried IPv6 for later */
priv = NM_DEVICE_GET_PRIVATE (self);
@@ -8504,7 +8504,7 @@ constructed (GObject *object)
priv->ignore_carrier = nm_config_get_ignore_carrier (nm_config_get (), self);
check_carrier (self);
- _LOGI (LOGD_HW,
+ _LOGD (LOGD_HW,
"carrier is %s%s",
priv->carrier ? "ON" : "OFF",
priv->ignore_carrier ? " (but ignored)" : "");
diff --git a/src/nm-manager.c b/src/nm-manager.c
index 704296d3cb..517887b3f6 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -1859,8 +1859,12 @@ add_device (NMManager *self, NMDevice *device, gboolean try_assume)
driver = nm_device_get_driver (device);
if (!driver)
driver = "unknown";
- nm_log_info (LOGD_HW, "(%s): new %s device (driver: '%s' ifindex: %d)",
- iface, type_desc, driver, nm_device_get_ifindex (device));
+ nm_log_info (LOGD_HW, "(%s): new %s device (carrier: %s, driver: '%s', ifindex: %d)",
+ iface, type_desc,
+ nm_device_has_capability (device, NM_DEVICE_CAP_CARRIER_DETECT)
+ ? (nm_device_has_carrier (device) ? "ON" : "OFF")
+ : "UNKNOWN",
+ driver, nm_device_get_ifindex (device));
unmanaged_specs = nm_settings_get_unmanaged_specs (priv->settings);
user_unmanaged = nm_device_spec_match_list (device, unmanaged_specs);