diff options
| author | Thomas Haller <thaller@redhat.com> | 2014-02-25 16:19:43 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-02-25 16:31:53 +0100 |
| commit | 72f554248863eebac3ee6c1657a9d2ffb47a45a9 (patch) | |
| tree | e7e7305d81159be57242273d4714a5ea46c84e14 | |
| parent | 68066b40f2704ee069201cfa7f9c0f3b976e690f (diff) | |
| download | NetworkManager-72f554248863eebac3ee6c1657a9d2ffb47a45a9.tar.gz | |
platform: downgrade error logging about NLE_DUMP_INTR on event socket
Such a failure can happen easily, because we now request an initial dump
to get AF_INET6 addresses in order to check for extended ifa flags support.
This is not critical, so downgrade the error log.
Signed-off-by: Thomas Haller <thaller@redhat.com>
| -rw-r--r-- | src/platform/nm-linux-platform.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index 2741ec1760..94cc81acf7 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -497,7 +497,7 @@ check_support_kernel_extended_ifa_flags (NMPlatform *platform) priv = NM_LINUX_PLATFORM_GET_PRIVATE (platform); if (priv->support_kernel_extended_ifa_flags == 0) { - g_warn_if_reached (); + nm_log_warn (LOGD_PLATFORM, "Unable to detect kernel support for extended IFA_FLAGS. Assume no kernel support."); priv->support_kernel_extended_ifa_flags = -1; } @@ -2769,8 +2769,18 @@ event_handler (GIOChannel *channel, int nle; nle = nl_recvmsgs_default (priv->nlh_event); - if (nle) - error ("Failed to retrieve incoming events: %s", nl_geterror (nle)); + if (nle < 0) + switch (nle) { + case NLE_DUMP_INTR: + /* this most likely happens due to our request (RTM_GETADDR, AF_INET6, NLM_F_DUMP) + * to detect support for support_kernel_extended_ifa_flags. This is not critical + * and can happen easily. */ + debug ("Uncritical failure to retrieve incoming events: %s (%d)", nl_geterror (nle), nle); + break; + default: + error ("Failed to retrieve incoming events: %s (%d)", nl_geterror (nle), nle); + break; + } return TRUE; } |