colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Thomas Haller
2018-09-11 22:03:11 +02:00
parent 4a4439835d
commit 2a45c32e8c
1 changed files with 6 additions and 7 deletions
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); g_variant_get (parameters, "(i)", &ifindex);
_LOGD ("set-ifindex %d", (int) ifindex);
if (priv->ifindex >= 0) { if (priv->ifindex >= 0) {
if (priv->ifindex == ifindex) 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 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; goto out;
} }
@@ -457,14 +455,15 @@ impl_ppp_manager_set_ifindex (NMDBusObject *obj,
} }
if (!plink) { if (!plink) {
_LOGW ("unknown interface with ifindex %d", ifindex); _LOGW ("set-ifindex: unknown interface with ifindex %d", ifindex);
ifindex = 0; 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; priv->ifindex = ifindex;
obj_keep_alive = nmp_object_ref (NMP_OBJECT_UP_CAST (plink));
g_signal_emit (self, g_signal_emit (self,
signals[IFINDEX_SET], signals[IFINDEX_SET],
0, 0,