From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 31 May 2019 14:08:31 +0000 (+0200)
Subject: networkctl: log quietly if we fail to get bit rates
X-Git-Tag: v243-rc1~317^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8210a61ad5ad50315673b9b8229dab129fd11ebe;p=thirdparty%2Fsystemd.git

networkctl: log quietly if we fail to get bit rates

If we query older networked, they will be missing. This is not an error.
Also, make the error more informative, because the bus error itself might
be just "Unknown interface or property" which is not enough to understand
what is going on.
---

diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index 9c23672ffd6..713c0cde0ed 100644
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -222,9 +222,11 @@ static int acquire_link_bitrates(sd_bus *bus, LinkInfo *link) {
                         "org.freedesktop.network1.Link",
                         "BitRates");
         if (r < 0) {
-                if (sd_bus_error_has_name(&error, BUS_ERROR_SPEED_METER_INACTIVE))
-                        return 0;
-                return log_error_errno(r, "%s", bus_error_message(&error, r));
+                bool quiet = sd_bus_error_has_name(&error, SD_BUS_ERROR_UNKNOWN_PROPERTY) ||
+                             sd_bus_error_has_name(&error, BUS_ERROR_SPEED_METER_INACTIVE);
+
+                return log_full_errno(quiet ? LOG_DEBUG : LOG_WARNING,
+                                      r, "Failed to query link bit rates: %s", bus_error_message(&error, r));
         }
 
         r = sd_bus_message_enter_container(reply, 'v', "(dd)");