diff options
| author | Dan Williams <dcbw@redhat.com> | 2014-06-11 13:32:00 -0500 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2014-06-12 15:52:54 -0500 |
| commit | 3bed6ceb28af6c3ebccbcb68f73eaaf3a14a6e4c (patch) | |
| tree | 7dfb7ca726fefa49dbe82ff006ee0172bba65534 | |
| parent | ea39eeacd5cfeb22876c62e774f8da9e411032a1 (diff) | |
| download | NetworkManager-3bed6ceb28af6c3ebccbcb68f73eaaf3a14a6e4c.tar.gz | |
keyfile: clean up logging connection verify errors
Prevents:
Connection failed to verify: (unknown)
invalid or missing connection property 'blah blah/foo bar'
Simply removing the warning in reader.c is fine, because callers that
care already log the warning themselves. Also make the warning in
update_connection() the same as the warning in new_connection().
| -rw-r--r-- | src/settings/plugins/keyfile/plugin.c | 3 | ||||
| -rw-r--r-- | src/settings/plugins/keyfile/reader.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/settings/plugins/keyfile/plugin.c b/src/settings/plugins/keyfile/plugin.c index e1b690a82f..10c8397180 100644 --- a/src/settings/plugins/keyfile/plugin.c +++ b/src/settings/plugins/keyfile/plugin.c @@ -110,7 +110,8 @@ update_connection (SCPluginKeyfile *self, tmp = nm_keyfile_connection_new (NULL, name, &error); if (!tmp) { /* Error; remove the connection */ - nm_log_warn (LOGD_SETTINGS, " %s", (error && error->message) ? error->message : "(unknown)"); + nm_log_warn (LOGD_SETTINGS, " error in connection %s: %s", name, + (error && error->message) ? error->message : "(unknown)"); g_clear_error (&error); remove_connection (self, connection); return; diff --git a/src/settings/plugins/keyfile/reader.c b/src/settings/plugins/keyfile/reader.c index 7fdfbee964..83090f37aa 100644 --- a/src/settings/plugins/keyfile/reader.c +++ b/src/settings/plugins/keyfile/reader.c @@ -1316,8 +1316,6 @@ nm_keyfile_plugin_connection_from_file (const char *filename, GError **error) g_clear_error (&verify_error); g_object_unref (connection); connection = NULL; - nm_log_warn (LOGD_SETTINGS, "Connection failed to verify: %s", - verify_error ? g_type_name (nm_connection_lookup_setting_type_by_quark (verify_error->domain)) : "(unknown)"); } out: |