wait-online: use log_link_debug() or friends

diff --git a/src/network/wait-online/link.c b/src/network/wait-online/link.c
index 201be477c20cec0a0430138c6f21ef08df43c2a9..a13373f7d7bec16a14f0057786656ad686a98cb0 100644 (file)
--- a/src/network/wait-online/link.c
+++ b/src/network/wait-online/link.c
@@ -113,44 +113,38 @@ int link_update_monitor(Link *l) {
 
         r = sd_network_link_get_required_for_online(l->ifindex);
         if (r < 0)
-                ret = log_debug_errno(r,
-                                      "Failed to get whether link %s is required for online or not, "
-                                      "ignoring: %m", l->ifname);
+                ret = log_link_debug_errno(l, r, "Failed to determine whether the link is required for online or not, "
+                                           "ignoring: %m");
         else
                 l->required_for_online = r > 0;
 
         r = sd_network_link_get_required_operstate_for_online(l->ifindex, &required_operstate);
         if (r < 0)
-                ret = log_debug_errno(r, "Failed to get required operational state for link %s to be online, "
-                                      "ignoring: %m", l->ifname);
+                ret = log_link_debug_errno(l, r, "Failed to get required operational state, ignoring: %m");
         else {
                 s = link_operstate_from_string(required_operstate);
                 if (s < 0)
-                        ret = log_debug_errno(SYNTHETIC_ERRNO(EINVAL),
-                                              "Failed to parse required operational state for link %s to be online, "
-                                              "ignoring: %m", l->ifname);
+                        ret = log_link_debug_errno(l, SYNTHETIC_ERRNO(EINVAL),
+                                                   "Failed to parse required operational state, ignoring: %m");
                 else
                         l->required_operstate = s;
         }
 
         r = sd_network_link_get_operational_state(l->ifindex, &operstate);
         if (r < 0)
-                ret = log_debug_errno(r, "Failed to get operational state of link %s, ignoring: %m",
-                                      l->ifname);
+                ret = log_link_debug_errno(l, r, "Failed to get operational state, ignoring: %m");
         else {
                 s = link_operstate_from_string(operstate);
                 if (s < 0)
-                        ret = log_debug_errno(SYNTHETIC_ERRNO(EINVAL),
-                                              "Failed to parse operational state of link %s, ignoring: %m",
-                                              l->ifname);
+                        ret = log_link_debug_errno(l, SYNTHETIC_ERRNO(EINVAL),
+                                                   "Failed to parse operational state, ignoring: %m");
                 else
                         l->operational_state = s;
         }
 
         r = sd_network_link_get_setup_state(l->ifindex, &state);
         if (r < 0)
-                ret = log_debug_errno(r, "Failed to get setup state of link %s, ignoring: %m",
-                                      l->ifname);
+                ret = log_link_debug_errno(l, r, "Failed to get setup state, ignoring: %m");
         else
                 free_and_replace(l->state, state);
 

diff --git a/src/network/wait-online/link.h b/src/network/wait-online/link.h
index 07c2499e1613c708493b69907be7819c83a4b3ce..d58129dfe872f658fa1ea8d68f0cd24fdc9b9e55 100644 (file)
--- a/src/network/wait-online/link.h
+++ b/src/network/wait-online/link.h
@@ -3,6 +3,7 @@
 
 #include "sd-netlink.h"
 
+#include "log-link.h"
 #include "network-util.h"
 
 typedef struct Link Link;

diff --git a/src/network/wait-online/manager.c b/src/network/wait-online/manager.c
index 48f197e74f934b5c9a0b2f15c2bf1460a439780e..eb551f116aedac50144a062987a45fa1d1633d7b 100644 (file)
--- a/src/network/wait-online/manager.c
+++ b/src/network/wait-online/manager.c
@@ -38,24 +38,21 @@ static int manager_link_is_online(Manager *m, Link *l, LinkOperationalState s) {
          *       0: operstate is not enough
          *       1: online */
 
-        if (!l->state) {
-                log_debug("link %s has not yet been processed by udev",
-                          l->ifname);
-                return -EAGAIN;
-        }
+        if (!l->state)
+                return log_link_debug_errno(l, SYNTHETIC_ERRNO(EAGAIN),
+                                            "link has not yet been processed by udev");
 
-        if (STR_IN_SET(l->state, "configuring", "pending")) {
-                log_debug("link %s is being processed by networkd",
-                          l->ifname);
-                return -EAGAIN;
-        }
+        if (STR_IN_SET(l->state, "configuring", "pending"))
+                return log_link_debug_errno(l, SYNTHETIC_ERRNO(EAGAIN),
+                                            "link is being processed by networkd");
 
         if (s < 0)
                 s = m->required_operstate >= 0 ? m->required_operstate : l->required_operstate;
 
         if (l->operational_state < s) {
-                log_debug("Operational state of link %s does not reach to %s",
-                          l->ifname, link_operstate_to_string(s));
+                log_link_debug(l, "Operational state '%s' is below '%s'",
+                               link_operstate_to_string(l->operational_state),
+                               link_operstate_to_string(s));
                 return 0;
         }
 
@@ -92,7 +89,7 @@ bool manager_all_configured(Manager *m) {
          * and at least one link to gain a carrier */
         HASHMAP_FOREACH(l, m->links, i) {
                 if (manager_ignore_link(m, l)) {
-                        log_info("ignoring: %s", l->ifname);
+                        log_link_info(l, "link is ignored");
                         continue;
                 }
 
@@ -155,17 +152,17 @@ static int manager_process_link(sd_netlink *rtnl, sd_netlink_message *mm, void *
 
                 r = link_update_rtnl(l, mm);
                 if (r < 0)
-                        log_warning_errno(r, "Failed to process RTNL link message, ignoring: %m");
+                        log_link_warning_errno(l, r, "Failed to process RTNL link message, ignoring: %m");
 
                 r = link_update_monitor(l);
                 if (r < 0)
-                        log_warning_errno(r, "Failed to initialize link object, ignoring: %m");
+                        log_link_warning_errno(l, r, "Failed to update link state, ignoring: %m");
 
                 break;
 
         case RTM_DELLINK:
                 if (l) {
-                        log_debug("Removing link %i", l->ifindex);
+                        log_link_debug(l, "Removing link");
                         link_free(l);
                 }
 
@@ -248,7 +245,7 @@ static int on_network_event(sd_event_source *s, int fd, uint32_t revents, void *
         HASHMAP_FOREACH(l, m->links, i) {
                 r = link_update_monitor(l);
                 if (r < 0)
-                        log_warning_errno(r, "Failed to update monitor information for %i: %m", l->ifindex);
+                        log_link_warning_errno(l, r, "Failed to update monitor information: %m");
         }
 
         if (manager_all_configured(m))