From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 23 Jan 2018 00:50:30 +0000 (+0900)
Subject: loopback-setup: update log message (#7956)
X-Git-Tag: v237~53
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=77d0776c3bd2516e7118d9a720b180cacaed5d58;p=thirdparty%2Fsystemd.git

loopback-setup: update log message (#7956)

This makes not log "Failed to ..." when each operation succeeds.

Fixes #7930.
---

diff --git a/src/core/loopback-setup.c b/src/core/loopback-setup.c
index 9a755258943..1528034e81f 100644
--- a/src/core/loopback-setup.c
+++ b/src/core/loopback-setup.c
@@ -32,21 +32,27 @@
 struct state {
         unsigned n_messages;
         int rcode;
-        const char *title;
+        const char *error_message;
+        const char *success_message;
 };
 
 static int generic_handler(sd_netlink *rtnl, sd_netlink_message *m, void *userdata) {
         struct state *s = userdata;
+        int r;
 
         assert(s);
         assert(s->n_messages > 0);
         s->n_messages--;
 
         errno = 0;
-        log_debug_errno(sd_netlink_message_get_errno(m), "Failed to %s: %m", s->title);
 
-        s->rcode = sd_netlink_message_get_errno(m);
+        r = sd_netlink_message_get_errno(m);
+        if (r < 0)
+                log_debug_errno(r, "%s: %m", s->error_message);
+        else
+                log_debug("%s", s->success_message);
 
+        s->rcode = r;
         return 0;
 }
 
@@ -165,9 +171,16 @@ static bool check_loopback(sd_netlink *rtnl) {
 
 int loopback_setup(void) {
         _cleanup_(sd_netlink_unrefp) sd_netlink *rtnl = NULL;
-        struct state state_4 = { .title = "add address 127.0.0.1 to loopback interface" },
-                     state_6 = { .title = "add address ::1 to loopback interface"},
-                     state_up = { .title = "bring loopback interface up" };
+        struct state state_4 = {
+                .error_message = "Failed to add address 127.0.0.1 to loopback interface",
+                .success_message = "Successfully added address 127.0.0.1 to loopback interface",
+        }, state_6 = {
+                .error_message = "Failed to add address ::1 to loopback interface",
+                .success_message = "Successfully added address ::1 to loopback interface",
+        }, state_up = {
+                .error_message = "Failed to bring loopback interface up",
+                .success_message = "Successfully brought loopback interface up",
+        };
         int r;
 
         r = sd_netlink_open(&rtnl);