fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-04 00:30:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

ppp: cleanup logging in impl_ppp_manager_set_ifindex()

Browse source 
It's enough that all code paths in impl_ppp_manager_set_ifindex() log exactly
one message. Also, give all messages the same prefix, so that it's clear where
they come from.

(cherry picked from commit 2a45c32e8c)
(cherry picked from commit d3ba511cce)
This commit is contained in:
Thomas Haller 2018-09-11 22:03:11 +02:00
parent b366f89bea
commit 5583fffddb
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/ppp/nm-ppp-manager.c
View file

@ -438,13 +438,11 @@ impl_ppp_manager_set_ifindex (NMDBusObject *obj,
g_variant_get (parameters, "(i)", &ifindex);
_LOGD ("set-ifindex %d", (int) ifindex);
if (priv->ifindex >= 0) {
if (priv->ifindex == ifindex)
_LOGD ("ignore repeated calls setting ifindex to %d", (int) ifindex);
_LOGD ("set-ifindex: ignore repeated calls setting ifindex to %d", (int) ifindex);
else
_LOGW ("can't change the ifindex from %d to %d", priv->ifindex, (int) ifindex);
_LOGW ("set-ifindex: can't change the ifindex from %d to %d", priv->ifindex, (int) ifindex);
goto out;
}
@ -457,14 +455,15 @@ impl_ppp_manager_set_ifindex (NMDBusObject *obj,
}
if (!plink) {
_LOGW ("unknown interface with ifindex %d", ifindex);
_LOGW ("set-ifindex: unknown interface with ifindex %d", ifindex);
ifindex = 0;
} else {
obj_keep_alive = nmp_object_ref (NMP_OBJECT_UP_CAST (plink));
_LOGD ("set-ifindex: %d, name \"%s\"", (int) ifindex, plink->name);
}
priv->ifindex = ifindex;
obj_keep_alive = nmp_object_ref (NMP_OBJECT_UP_CAST (plink));
g_signal_emit (self,
signals[IFINDEX_SET],
0,