fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-06 17:50:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

settings: log settings plugin name

Browse source 
Instead of

  <info>  [1558284380.2045] settings: Loaded settings plugin: SettingsPluginIfcfg ("/usr/lib64/NetworkManager/1.19.2/libnm-settings-plugin-ifcfg-rh.so")

log

  <info>  [1558284380.2045] settings: Loaded settings plugin: ifcfg-rh ("/usr/lib64/NetworkManager/1.19.2/libnm-settings-plugin-ifcfg-rh.so")

Note how `man NetworkManager.conf` documents "main.plugins" configuration
option where settings plugins have names like "keyfile" and "ifcfg-rh".
It's not helpful to log the GObject type name, which is an implementation
detail.
This commit is contained in:
Thomas Haller 2019-05-20 15:30:18 +02:00
parent 18acdeeba5
commit 50be2f5244
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/settings/nm-settings.c
View file

@ -596,7 +596,10 @@ unrecognized_specs_changed (NMSettingsPlugin *config,
}
static void
add_plugin (NMSettings *self, NMSettingsPlugin *plugin, const char *path)
add_plugin (NMSettings *self,
NMSettingsPlugin *plugin,
const char *pname,
const char *path)
{
NMSettingsPrivate *priv;
@ -612,7 +615,7 @@ add_plugin (NMSettings *self, NMSettingsPlugin *plugin, const char *path)
nm_settings_plugin_initialize (plugin);
_LOGI ("Loaded settings plugin: %s (%s%s%s)",
G_OBJECT_TYPE_NAME (plugin),
pname,
NM_PRINT_FMT_QUOTED (path, "\"", path, "\"", "internal"));
}
@ -677,7 +680,7 @@ add_plugin_load_file (NMSettings *self, const char *pname, GError **error)
return FALSE;
}
add_plugin (self, NM_SETTINGS_PLUGIN (plugin), path);
add_plugin (self, NM_SETTINGS_PLUGIN (plugin), pname, path);
return TRUE;
}
@ -687,7 +690,7 @@ add_plugin_keyfile (NMSettings *self)
gs_unref_object NMSKeyfilePlugin *keyfile_plugin = NULL;
keyfile_plugin = nms_keyfile_plugin_new ();
add_plugin (self, NM_SETTINGS_PLUGIN (keyfile_plugin), NULL);
add_plugin (self, NM_SETTINGS_PLUGIN (keyfile_plugin), "keyfile", NULL);
}
static gboolean