fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-25 17:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

config: unify logging line when reloading configuration

Browse source 
Also when config_data changes, the logging line should start with
"config: signal" like it does in the other cases.
This commit is contained in:
Thomas Haller 2016-05-31 09:31:22 +02:00
parent ca5028e608
commit 02034cead3
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/nm-config.c
View file

@ -1983,8 +1983,9 @@ _set_config_data (NMConfig *self, NMConfigData *new_data, NMConfigChangeFlags re
}
if (new_data) {
nm_log_info (LOGD_CORE, "config: update %s (%s)", nm_config_data_get_config_description (new_data),
nm_config_change_flags_to_string (changes, NULL, 0));
nm_log_info (LOGD_CORE, "config: signal %s (%s)",
nm_config_change_flags_to_string (changes, NULL, 0),
nm_config_data_get_config_description (new_data));
nm_config_data_log (new_data, "CONFIG: ", " ", NULL);
priv->config_data = new_data;
} else if (had_new_data)

6
src/tests/config/test-config.c
View file

@ -343,7 +343,7 @@ test_config_no_auto_default (void)
g_assert (!nm_config_get_no_auto_default_for_device (config, dev3));
g_assert (nm_config_get_no_auto_default_for_device (config, dev4));
g_test_expect_message ("NetworkManager", G_LOG_LEVEL_INFO, "*config: update * (NO_AUTO_DEFAULT,no-auto-default)*");
g_test_expect_message ("NetworkManager", G_LOG_LEVEL_INFO, "*config: signal NO_AUTO_DEFAULT,no-auto-default *");
nm_config_set_no_auto_default_for_device (config, dev3);
g_test_assert_expected_messages ();
@ -556,7 +556,7 @@ _set_values_user (NMConfig *config,
config_data_before = g_object_ref (nm_config_get_data (config));
if (expected_changes != NM_CONFIG_CHANGE_NONE)
g_test_expect_message ("NetworkManager", G_LOG_LEVEL_INFO, "*config: update *");
g_test_expect_message ("NetworkManager", G_LOG_LEVEL_INFO, "*config: signal *");
else
g_test_expect_message ("NetworkManager", G_LOG_LEVEL_INFO, "*config: signal SIGHUP (no changes from disk)*");
@ -600,7 +600,7 @@ _set_values_intern (NMConfig *config,
&config_changed_data);
if (expected_changes != NM_CONFIG_CHANGE_NONE)
g_test_expect_message ("NetworkManager", G_LOG_LEVEL_INFO, "*config: update *");
g_test_expect_message ("NetworkManager", G_LOG_LEVEL_INFO, "*config: signal *");
nm_config_set_values (config, keyfile_intern, TRUE, FALSE);