diff options
| author | Dan Williams <dcbw@redhat.com> | 2013-11-06 22:18:02 -0600 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2013-11-08 16:46:44 -0600 |
| commit | ffea69e06bad520f493bb3578629285cd536a14e (patch) | |
| tree | 66d035c76b3481d897f2cc2217285be5aaed1c0e | |
| parent | 5023af9b8475140941280e47b7474913bf8b35cc (diff) | |
| download | NetworkManager-ffea69e06bad520f493bb3578629285cd536a14e.tar.gz | |
trivial: refine connection generation logging
| -rw-r--r-- | src/devices/nm-device.c | 2 | ||||
| -rw-r--r-- | src/nm-manager.c | 13 |
2 files changed, 5 insertions, 10 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 5122cd991a..d836ab0e0e 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -1654,8 +1654,6 @@ nm_device_generate_connection (NMDevice *device) if (!device_has_config (device)) return NULL; - nm_log_info (LOGD_DEVICE, "(%s): Generating connection from current device status.", ifname); - connection = nm_connection_new (); s_con = nm_setting_connection_new (); uuid = nm_utils_uuid_generate (); diff --git a/src/nm-manager.c b/src/nm-manager.c index 9ffb97ec1e..3bd5e97d36 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -1782,11 +1782,8 @@ get_existing_connection (NMManager *manager, NMDevice *device) * returns NULL. */ connection = nm_device_generate_connection (device); - if (!connection) { - nm_log_info (LOGD_DEVICE, "(%s): No existing connection detected.", - nm_device_get_iface (device)); + if (!connection) return NULL; - } /* Now we need to compare the generated connection to each configured * connection. The comparison function is the heart of the connection @@ -1801,7 +1798,7 @@ get_existing_connection (NMManager *manager, NMDevice *device) NMConnection *candidate = NM_CONNECTION (iter->data); if (nm_connection_compare (connection, candidate, NM_SETTING_COMPARE_FLAG_CANDIDATE)) { - nm_log_info (LOGD_DEVICE, "(%s): Found matching connection: '%s'", + nm_log_info (LOGD_DEVICE, "(%s): found matching connection '%s'", nm_device_get_iface (device), nm_connection_get_id (candidate)); g_object_unref (connection); @@ -1809,9 +1806,9 @@ get_existing_connection (NMManager *manager, NMDevice *device) } } - nm_log_info (LOGD_DEVICE, "(%s): Using generated connection: '%s'", - nm_device_get_iface (device), - nm_connection_get_id (connection)); + nm_log_dbg (LOGD_DEVICE, "(%s): generated connection '%s'", + nm_device_get_iface (device), + nm_connection_get_id (connection)); added = nm_settings_add_connection (priv->settings, connection, FALSE, &error); if (!added) { |