diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-05-31 09:31:22 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-06-01 15:32:26 +0200 |
| commit | 8ff6005825137df5065c0c22978012a333add068 (patch) | |
| tree | 637235bf3be52a08f57a056d2a09575de7419b83 | |
| parent | 11659aa29615a044f83a134927c7cdc1808dcf0d (diff) | |
| download | NetworkManager-8ff6005825137df5065c0c22978012a333add068.tar.gz | |
config: unify logging line when reloading configuration
Also when config_data changes, the logging line should start with
"config: signal" like it does in the other cases.
| -rw-r--r-- | src/nm-config.c | 5 | ||||
| -rw-r--r-- | src/tests/config/test-config.c | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/nm-config.c b/src/nm-config.c index 1743a20246..118895348c 100644 --- a/src/nm-config.c +++ b/src/nm-config.c @@ -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) diff --git a/src/tests/config/test-config.c b/src/tests/config/test-config.c index d7a7199e3f..73358d027c 100644 --- a/src/tests/config/test-config.c +++ b/src/tests/config/test-config.c @@ -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); |