]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
networkctl: log quietly if we fail to get bit rates
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Fri, 31 May 2019 14:08:31 +0000 (16:08 +0200)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Tue, 4 Jun 2019 06:37:04 +0000 (08:37 +0200)
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.

src/network/networkctl.c

index 9c23672ffd65b49c6821a393c74969cdfebf5fe1..713c0cde0eda6b916aa89d43f5634a4829d77b45 100644 (file)
@@ -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)");