trivial: move some log messages earlier

Would have been helpful to more easily catch a bug cyphermox and
I were discussion on IRC.
This commit is contained in:
Dan Williams 2011-12-06 16:36:37 -06:00
parent ce9d8a68d7
commit 4fd510cbcd

View file

@ -2561,6 +2561,10 @@ nm_device_activate_ip4_config_commit (gpointer user_data)
/* Clear the activation source ID now that this stage has run */
activation_source_clear (self, FALSE, 0);
iface = nm_device_get_iface (self);
nm_log_info (LOGD_DEVICE, "Activation (%s) Stage 5 of 5 (IPv4 Commit) started...",
iface);
req = nm_device_get_act_request (self);
g_assert (req);
connection = nm_act_request_get_connection (req);
@ -2569,10 +2573,6 @@ nm_device_activate_ip4_config_commit (gpointer user_data)
config = g_object_get_data (G_OBJECT (req), PENDING_IP4_CONFIG);
g_assert (config);
iface = nm_device_get_iface (self);
nm_log_info (LOGD_DEVICE, "Activation (%s) Stage 5 of 5 (IPv4 Commit) started...",
iface);
/* Make sure the interface is up again just because */
ifindex = nm_device_get_ip_ifindex (self);
if ((ifindex > 0) && (nm_system_iface_is_up (ifindex) == FALSE))
@ -2720,6 +2720,10 @@ nm_device_activate_ip6_config_commit (gpointer user_data)
/* Clear the activation source ID now that this stage has run */
activation_source_clear (self, FALSE, 0);
iface = nm_device_get_iface (self);
nm_log_info (LOGD_DEVICE, "Activation (%s) Stage 5 of 5 (IPv6 Commit) started...",
iface);
req = nm_device_get_act_request (self);
g_assert (req);
connection = nm_act_request_get_connection (req);
@ -2728,10 +2732,6 @@ nm_device_activate_ip6_config_commit (gpointer user_data)
config = g_object_get_data (G_OBJECT (req), PENDING_IP6_CONFIG);
g_assert (config);
iface = nm_device_get_iface (self);
nm_log_info (LOGD_DEVICE, "Activation (%s) Stage 5 of 5 (IPv6 Commit) started...",
iface);
/* Make sure the interface is up again just because */
ifindex = nm_device_get_ip_ifindex (self);
if ((ifindex > 0) && (nm_system_iface_is_up (ifindex) == FALSE))