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

manager: add more logging to recheck_assume_connection()

Browse source 
and give all lines a logging prefix.

(cherry picked from commit 94534e0327)
This commit is contained in:
Thomas Haller 2017-06-07 13:30:08 +02:00
parent 01fd9df6e5
commit 7e2d64a8b2
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/nm-manager.c
View file

@ -1901,22 +1901,27 @@ recheck_assume_connection (NMManager *self,
if (!nm_device_get_managed (device, FALSE)) { if (!nm_device_get_managed (device, FALSE)) {
nm_device_assume_state_reset (device); nm_device_assume_state_reset (device);
_LOG2D (LOGD_DEVICE, device, "assume: don't assume because %s", "not managed");
return FALSE; return FALSE;
} }
state = nm_device_get_state (device); state = nm_device_get_state (device);
if (state > NM_DEVICE_STATE_DISCONNECTED) { if (state > NM_DEVICE_STATE_DISCONNECTED) {
nm_device_assume_state_reset (device); nm_device_assume_state_reset (device);
_LOG2D (LOGD_DEVICE, device, "assume: don't assume due to device state %s",
nm_device_state_to_str (state));
return FALSE; return FALSE;
} }
connection = get_existing_connection (self, device, &generated); connection = get_existing_connection (self, device, &generated);
if (!connection) { if (!connection) {
_LOG2D (LOGD_DEVICE, device, "can't assume; no connection"); _LOG2D (LOGD_DEVICE, device, "assume: don't assume because %s", "no connection was generated");
return FALSE; return FALSE;
} }
_LOG2D (LOGD_DEVICE, device, "will attempt to assume connection"); _LOG2D (LOGD_DEVICE, device, "assume: will attempt to assume %sconnection %s",
generated ? "generated " : "",
nm_connection_get_uuid (NM_CONNECTION (connection)));
nm_device_sys_iface_state_set (device, nm_device_sys_iface_state_set (device,
generated generated
@ -1951,7 +1956,7 @@ recheck_assume_connection (NMManager *self,
&error); &error);
if (!active) { if (!active) {
_LOGW (LOGD_DEVICE, "assumed connection %s failed to activate: %s", _LOGW (LOGD_DEVICE, "assume: assumed connection %s failed to activate: %s",
nm_connection_get_path (NM_CONNECTION (connection)), nm_connection_get_path (NM_CONNECTION (connection)),
error->message); error->message);
g_error_free (error); g_error_free (error);
@ -1963,7 +1968,7 @@ recheck_assume_connection (NMManager *self,
} }
if (generated) { if (generated) {
_LOG2D (LOGD_DEVICE, device, "connection assumption failed. Deleting generated connection"); _LOG2D (LOGD_DEVICE, device, "assume: deleting generated connection after assuming failed");
nm_settings_connection_delete (connection, NULL, NULL); nm_settings_connection_delete (connection, NULL, NULL);
} else { } else {
if (nm_device_sys_iface_state_get (device) == NM_DEVICE_SYS_IFACE_STATE_ASSUME) if (nm_device_sys_iface_state_get (device) == NM_DEVICE_SYS_IFACE_STATE_ASSUME)