diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-10-05 13:05:05 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-10-05 13:05:05 +0200 |
| commit | bb9d4b0ad120af2b66436caa65ff5093e6ad754a (patch) | |
| tree | 903024101ef2a9dccab935a8852f566e8608afe9 | |
| parent | 6b40108418035ebb0499529f61b2a1e8aa3340e0 (diff) | |
| download | NetworkManager-bb9d4b0ad120af2b66436caa65ff5093e6ad754a.tar.gz | |
device: use _LOG() logging macros for per-device logging
| -rw-r--r-- | src/devices/nm-device.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index b15515b790..5d9644e8e6 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -8701,15 +8701,14 @@ deactivate_async_ready (NMDevice *self, /* If operation cancelled, just return */ if ( g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED) || (priv->deactivating_cancellable && g_cancellable_is_cancelled (priv->deactivating_cancellable))) { - nm_log_warn (LOGD_DEVICE, "Deactivation (%s) cancelled", - nm_device_get_iface (self)); + _LOGW (LOGD_DEVICE, "Deactivation cancelled"); } /* In every other case, transition to the DISCONNECTED state */ else { - if (error) - nm_log_warn (LOGD_DEVICE, "Deactivation (%s) failed: %s", - nm_device_get_iface (self), - error->message); + if (error) { + _LOGW (LOGD_DEVICE, "Deactivation failed: %s", + error->message); + } nm_device_queue_state (self, NM_DEVICE_STATE_DISCONNECTED, reason); } |