diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-07-24 17:41:42 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-07-25 23:27:49 +0200 |
| commit | ea5813ebf042c55b8d2a63eabf934e9ebf90ad63 (patch) | |
| tree | d2c4c99b66a1b0fcbe0a96c872d92234c39b22f8 | |
| parent | ea9627b9ea8ad45453f7d587c89b3c60582ae88b (diff) | |
| download | NetworkManager-ea5813ebf042c55b8d2a63eabf934e9ebf90ad63.tar.gz | |
settings: log information about shadowed-storage for change events
| -rw-r--r-- | src/settings/nm-settings.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c index c4cc1d8fd3..5a2417b043 100644 --- a/src/settings/nm-settings.c +++ b/src/settings/nm-settings.c @@ -1189,26 +1189,27 @@ _connection_changed_track (NMSettings *self, if (_LOGT_ENABLED ()) { const char *filename; const NMSettingsMetaData *meta_data; + const char *shadowed_storage; + gboolean shadowed_owned; filename = nm_settings_storage_get_filename (storage); if (connection) { - _LOGT ("storage[%s,"NM_SETTINGS_STORAGE_PRINT_FMT"]: change event with connection \"%s\"%s%s%s", + shadowed_storage = nm_settings_storage_get_shadowed_storage (storage, &shadowed_owned); + _LOGT ("storage[%s,"NM_SETTINGS_STORAGE_PRINT_FMT"]: change event with connection \"%s\"%s%s%s%s%s%s", sett_conn_entry->uuid, NM_SETTINGS_STORAGE_PRINT_ARG (storage), nm_connection_get_id (connection), - NM_PRINT_FMT_QUOTED (filename, " (file \"", filename, "\")", "")); + NM_PRINT_FMT_QUOTED (filename, " (file \"", filename, "\")", ""), + NM_PRINT_FMT_QUOTED (shadowed_storage, shadowed_owned ? " (owns \"" : " (shadows \"", shadowed_storage, "\")", "")); } else if ((meta_data = nm_settings_storage_is_meta_data (storage))) { - if (meta_data->is_tombstone) { - _LOGT ("storage[%s,"NM_SETTINGS_STORAGE_PRINT_FMT"]: change event for hiding profile%s%s%s", - sett_conn_entry->uuid, - NM_SETTINGS_STORAGE_PRINT_ARG (storage), - NM_PRINT_FMT_QUOTED (filename, " (file \"", filename, "\")", "")); - } else { - _LOGT ("storage[%s,"NM_SETTINGS_STORAGE_PRINT_FMT"]: change event with meta data for profile%s%s%s", - sett_conn_entry->uuid, - NM_SETTINGS_STORAGE_PRINT_ARG (storage), - NM_PRINT_FMT_QUOTED (filename, " (file \"", filename, "\")", "")); - } + nm_assert (meta_data->is_tombstone); + shadowed_storage = nm_settings_storage_get_shadowed_storage (storage, &shadowed_owned); + _LOGT ("storage[%s,"NM_SETTINGS_STORAGE_PRINT_FMT"]: change event for %shiding profile%s%s%s%s%s%s", + sett_conn_entry->uuid, + NM_SETTINGS_STORAGE_PRINT_ARG (storage), + nm_settings_storage_is_meta_data_alive (storage) ? "" : "dropping ", + NM_PRINT_FMT_QUOTED (filename, " (file \"", filename, "\")", ""), + NM_PRINT_FMT_QUOTED (shadowed_storage, shadowed_owned ? " (owns \"" : " (shadows \"", shadowed_storage, "\")", "")); } else { _LOGT ("storage[%s,"NM_SETTINGS_STORAGE_PRINT_FMT"]: change event for dropping profile%s%s%s", sett_conn_entry->uuid, |