fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-06 06:48:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

core/logging: reduce info logging messages for devices

Browse source 
https://bugzilla.redhat.com/show_bug.cgi?id=1212196
This commit is contained in:
Thomas Haller 2015-04-17 13:47:10 +02:00
parent 9983e4eff5
commit b91b8a035c
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/devices/nm-device.c
View file

@ -493,7 +493,7 @@ nm_device_dbus_export (NMDevice *self)
g_return_if_fail (priv->path == NULL); g_return_if_fail (priv->path == NULL);
priv->path = g_strdup_printf ("/org/freedesktop/NetworkManager/Devices/%d", devcount++); 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); 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)); g_return_if_fail (NM_IS_DEVICE (self));
if (reason == NM_DEVICE_STATE_REASON_NOW_MANAGED) if (reason == NM_DEVICE_STATE_REASON_NOW_MANAGED)
_LOGI (LOGD_DEVICE, "preparing device"); _LOGD (LOGD_DEVICE, "preparing device");
else 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 */ /* Save whether or not we tried IPv6 for later */
priv = NM_DEVICE_GET_PRIVATE (self); 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); priv->ignore_carrier = nm_config_get_ignore_carrier (nm_config_get (), self);
check_carrier (self); check_carrier (self);
_LOGI (LOGD_HW, _LOGD (LOGD_HW,
"carrier is %s%s", "carrier is %s%s",
priv->carrier ? "ON" : "OFF", priv->carrier ? "ON" : "OFF",
priv->ignore_carrier ? " (but ignored)" : ""); priv->ignore_carrier ? " (but ignored)" : "");

8
src/nm-manager.c
View file

@ -1859,8 +1859,12 @@ add_device (NMManager *self, NMDevice *device, gboolean try_assume)
driver = nm_device_get_driver (device); driver = nm_device_get_driver (device);
if (!driver) if (!driver)
driver = "unknown"; driver = "unknown";
nm_log_info (LOGD_HW, "(%s): new %s device (driver: '%s' ifindex: %d)", nm_log_info (LOGD_HW, "(%s): new %s device (carrier: %s, driver: '%s', ifindex: %d)",
iface, type_desc, driver, nm_device_get_ifindex (device)); 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); unmanaged_specs = nm_settings_get_unmanaged_specs (priv->settings);
user_unmanaged = nm_device_spec_match_list (device, unmanaged_specs); user_unmanaged = nm_device_spec_match_list (device, unmanaged_specs);