SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loopback-setup: update log message (#7956)

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

Fixes #7930.
This commit is contained in:
Yu Watanabe
2018-01-23 09:50:31 +09:00
committed by GitHub
parent b391a8d895
commit 77d0776c3b
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/loopback-setup.c
+19 -6
View File
@@ -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);