diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-01-05 11:16:22 +0100 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-01-05 11:45:16 +0100 |
commit | 907e277fddef00e8473c42cd5a71b6bcce314658 (patch) | |
tree | 60fa1fc887ca7456dd3a48176542a2f226b63090 /src | |
parent | bd187da8c44bd4d99751cd47685c686ebfc669ac (diff) | |
download | systemd-907e277fddef00e8473c42cd5a71b6bcce314658.tar.gz |
network: move logging from qdisc_configure()/tclass_configure() to the caller
Diffstat (limited to 'src')
-rw-r--r-- | src/network/tc/qdisc.c | 14 | ||||
-rw-r--r-- | src/network/tc/tc.c | 2 | ||||
-rw-r--r-- | src/network/tc/tclass.c | 12 |
3 files changed, 14 insertions, 14 deletions
diff --git a/src/network/tc/qdisc.c b/src/network/tc/qdisc.c index 32b55e99f8..995df2fc86 100644 --- a/src/network/tc/qdisc.c +++ b/src/network/tc/qdisc.c @@ -184,16 +184,16 @@ int qdisc_configure(Link *link, QDisc *qdisc) { r = sd_rtnl_message_new_qdisc(link->manager->rtnl, &req, RTM_NEWQDISC, qdisc->family, link->ifindex); if (r < 0) - return log_link_error_errno(link, r, "Could not create RTM_NEWQDISC message: %m"); + return log_link_debug_errno(link, r, "Could not create RTM_NEWQDISC message: %m"); r = sd_rtnl_message_set_qdisc_parent(req, qdisc->parent); if (r < 0) - return log_link_error_errno(link, r, "Could not create tcm_parent message: %m"); + return r; if (qdisc->handle != TC_H_UNSPEC) { r = sd_rtnl_message_set_qdisc_handle(req, qdisc->handle); if (r < 0) - return log_link_error_errno(link, r, "Could not set tcm_handle message: %m"); + return r; } if (QDISC_VTABLE(qdisc)) { @@ -204,23 +204,23 @@ int qdisc_configure(Link *link, QDisc *qdisc) { } else { r = sd_netlink_message_append_string(req, TCA_KIND, QDISC_VTABLE(qdisc)->tca_kind); if (r < 0) - return log_link_error_errno(link, r, "Could not append TCA_KIND attribute: %m"); + return r; } if (QDISC_VTABLE(qdisc)->fill_message) { r = QDISC_VTABLE(qdisc)->fill_message(link, qdisc, req); if (r < 0) - return log_link_error_errno(link, r, "Could not fill netlink message: %m"); + return r; } } else { r = sd_netlink_message_append_string(req, TCA_KIND, qdisc->tca_kind); if (r < 0) - return log_link_error_errno(link, r, "Could not append TCA_KIND attribute: %m"); + return r; } r = netlink_call_async(link->manager->rtnl, NULL, req, qdisc_handler, link_netlink_destroy_callback, link); if (r < 0) - return log_link_error_errno(link, r, "Could not send rtnetlink message: %m"); + return log_link_debug_errno(link, r, "Could not send netlink message: %m"); link_ref(link); link->tc_messages++; diff --git a/src/network/tc/tc.c b/src/network/tc/tc.c index a3cfed53fa..8f76809c7d 100644 --- a/src/network/tc/tc.c +++ b/src/network/tc/tc.c @@ -52,7 +52,7 @@ int link_configure_traffic_control(Link *link) { ORDERED_HASHMAP_FOREACH(tc, link->network->tc_by_section) { r = traffic_control_configure(link, tc); if (r < 0) - return r; + return log_link_error_errno(link, r, "Could not create send configuration message: %m"); } if (link->tc_messages == 0) diff --git a/src/network/tc/tclass.c b/src/network/tc/tclass.c index 24a66579f9..10bffd65c6 100644 --- a/src/network/tc/tclass.c +++ b/src/network/tc/tclass.c @@ -139,31 +139,31 @@ int tclass_configure(Link *link, TClass *tclass) { r = sd_rtnl_message_new_tclass(link->manager->rtnl, &req, RTM_NEWTCLASS, AF_UNSPEC, link->ifindex); if (r < 0) - return log_link_error_errno(link, r, "Could not create RTM_NEWTCLASS message: %m"); + return log_link_debug_errno(link, r, "Could not create RTM_NEWTCLASS message: %m"); r = sd_rtnl_message_set_tclass_parent(req, tclass->parent); if (r < 0) - return log_link_error_errno(link, r, "Could not create tcm_parent message: %m"); + return r; if (tclass->classid != TC_H_UNSPEC) { r = sd_rtnl_message_set_tclass_handle(req, tclass->classid); if (r < 0) - return log_link_error_errno(link, r, "Could not set tcm_handle message: %m"); + return r; } r = sd_netlink_message_append_string(req, TCA_KIND, TCLASS_VTABLE(tclass)->tca_kind); if (r < 0) - return log_link_error_errno(link, r, "Could not append TCA_KIND attribute: %m"); + return r; if (TCLASS_VTABLE(tclass)->fill_message) { r = TCLASS_VTABLE(tclass)->fill_message(link, tclass, req); if (r < 0) - return log_link_error_errno(link, r, "Could not fill netlink message: %m"); + return r; } r = netlink_call_async(link->manager->rtnl, NULL, req, tclass_handler, link_netlink_destroy_callback, link); if (r < 0) - return log_link_error_errno(link, r, "Could not send rtnetlink message: %m"); + return log_link_debug_errno(link, r, "Could not send netlink message: %m"); link_ref(link); link->tc_messages++; |