picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

networkd: improve logging

Browse source 
This gives a bit better messages when a link is added twice.
This commit is contained in:
Tom Gundersen 2014-01-03 16:38:18 +01:00
parent efbc88b8ed
commit 2672953bde
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/network/networkd-link.c
View file

@ -102,13 +102,11 @@ int link_add(Manager *m, struct udev_device *device) {
ifindex = udev_device_get_ifindex(device);
link = hashmap_get(m->links, &ifindex);
if (link)
return 0;
return -EEXIST;
r = link_new(m, device, &link);
if (r < 0) {
log_error("Could not create link: %s", strerror(-r));
if (r < 0)
return r;
}
devtype = udev_device_get_devtype(device);
if (streq_ptr(devtype, "bridge")) {

15
src/network/networkd-manager.c
View file

@ -143,14 +143,17 @@ static int manager_process_link(Manager *m, struct udev_device *device) {
link_free(link);
} else {
log_debug("%s: link added", udev_device_get_sysname(device));
r = link_add(m, device);
if (r < 0) {
log_error("Could not handle link %s: %s",
udev_device_get_sysname(device),
strerror(-r));
}
if (r == -EEXIST)
log_debug("%s: link already exists, ignoring",
udev_device_get_sysname(device));
else
log_error("%s: could not handle link: %s",
udev_device_get_sysname(device),
strerror(-r));
} else
log_debug("%s: link added", udev_device_get_sysname(device));
}
return 0;