From a569c2c5fd226a5c166b68133838a989a583e1de Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 26 Feb 2024 11:30:34 +0900 Subject: [PATCH 1/2] network/varlink: downgrade log level about failure in getting netns ID --- src/network/networkd-manager-varlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/network/networkd-manager-varlink.c b/src/network/networkd-manager-varlink.c index 30aebb5d9e..8aefb686c6 100644 --- a/src/network/networkd-manager-varlink.c +++ b/src/network/networkd-manager-varlink.c @@ -47,7 +47,7 @@ static int vl_method_get_namespace_id(Varlink *link, JsonVariant *parameters, Va r = netns_get_nsid(/* netnsfd= */ -EBADF, &nsid); if (r < 0) - log_warning_errno(r, "Failed to query network nsid, ignoring: %m"); + log_full_errno(r == -ENODATA ? LOG_DEBUG : LOG_WARNING, r, "Failed to query network nsid, ignoring: %m"); return varlink_replyb(link, JSON_BUILD_OBJECT( From eaa260cd748591dcae22368a5ea1b37c5351aae1 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 26 Feb 2024 13:42:01 +0900 Subject: [PATCH 2/2] varlink/network: reindent methods --- src/shared/varlink-io.systemd.Network.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/shared/varlink-io.systemd.Network.c b/src/shared/varlink-io.systemd.Network.c index 7477d42de8..feb1e52feb 100644 --- a/src/shared/varlink-io.systemd.Network.c +++ b/src/shared/varlink-io.systemd.Network.c @@ -2,17 +2,19 @@ #include "varlink-io.systemd.Network.h" -static VARLINK_DEFINE_METHOD(GetStates, - VARLINK_DEFINE_OUTPUT(AddressState, VARLINK_STRING, 0), - VARLINK_DEFINE_OUTPUT(IPv4AddressState, VARLINK_STRING, 0), - VARLINK_DEFINE_OUTPUT(IPv6AddressState, VARLINK_STRING, 0), - VARLINK_DEFINE_OUTPUT(CarrierState, VARLINK_STRING, 0), - VARLINK_DEFINE_OUTPUT(OnlineState, VARLINK_STRING, VARLINK_NULLABLE), - VARLINK_DEFINE_OUTPUT(OperationalState, VARLINK_STRING, 0)); +static VARLINK_DEFINE_METHOD( + GetStates, + VARLINK_DEFINE_OUTPUT(AddressState, VARLINK_STRING, 0), + VARLINK_DEFINE_OUTPUT(IPv4AddressState, VARLINK_STRING, 0), + VARLINK_DEFINE_OUTPUT(IPv6AddressState, VARLINK_STRING, 0), + VARLINK_DEFINE_OUTPUT(CarrierState, VARLINK_STRING, 0), + VARLINK_DEFINE_OUTPUT(OnlineState, VARLINK_STRING, VARLINK_NULLABLE), + VARLINK_DEFINE_OUTPUT(OperationalState, VARLINK_STRING, 0)); -static VARLINK_DEFINE_METHOD(GetNamespaceId, - VARLINK_DEFINE_OUTPUT(NamespaceId, VARLINK_INT, 0), - VARLINK_DEFINE_OUTPUT(NamespaceNSID, VARLINK_INT, VARLINK_NULLABLE)); +static VARLINK_DEFINE_METHOD( + GetNamespaceId, + VARLINK_DEFINE_OUTPUT(NamespaceId, VARLINK_INT, 0), + VARLINK_DEFINE_OUTPUT(NamespaceNSID, VARLINK_INT, VARLINK_NULLABLE)); VARLINK_DEFINE_INTERFACE( io_systemd_Network,