diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-02-21 16:39:51 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-03-13 09:03:59 +0100 |
| commit | bbfb8a9b333643effe84829f78289939bc3bb025 (patch) | |
| tree | 1482888b9f6dd65d4c1202c3c44bb3692baf2c16 | |
| parent | 2c37a3fb1ed4faccf60f06b81b1ca2a7f4fa6f5e (diff) | |
| download | NetworkManager-bbfb8a9b333643effe84829f78289939bc3bb025.tar.gz | |
platform: suppress unnecessary logging in do_request_all_no_delayed_actions()
When we refresh all links, we clear all flags to refresh a specific
link. However, only log a message if there was anything to clear.
| -rw-r--r-- | src/platform/nm-linux-platform.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index 2f5c75b055..396ae742a3 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -5281,10 +5281,15 @@ do_request_all_no_delayed_actions (NMPlatform *platform, DelayedActionType actio /* clear any delayed action that request a refresh of this object type. */ priv->delayed_action.flags &= ~iflags; _LOGt_delayed_action (iflags, NULL, "handle (do-request-all)"); + if (obj_type == NMP_OBJECT_TYPE_LINK) { - priv->delayed_action.flags &= ~DELAYED_ACTION_TYPE_REFRESH_LINK; - g_ptr_array_set_size (priv->delayed_action.list_refresh_link, 0); - _LOGt_delayed_action (DELAYED_ACTION_TYPE_REFRESH_LINK, NULL, "clear (do-request-all)"); + nm_assert ( (priv->delayed_action.list_refresh_link->len > 0) + == NM_FLAGS_HAS (priv->delayed_action.flags, DELAYED_ACTION_TYPE_REFRESH_LINK)); + if (NM_FLAGS_HAS (priv->delayed_action.flags, DELAYED_ACTION_TYPE_REFRESH_LINK)) { + _LOGt_delayed_action (DELAYED_ACTION_TYPE_REFRESH_LINK, NULL, "clear (do-request-all)"); + priv->delayed_action.flags &= ~DELAYED_ACTION_TYPE_REFRESH_LINK; + g_ptr_array_set_size (priv->delayed_action.list_refresh_link, 0); + } } event_handler_read_netlink (platform, FALSE); |