fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-09 04:48:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

device/wifi: silence some logging for AP changes

Browse source 
We log updates of the Wi-Fi AP with a separate logging domain LOGD_WIFI_SCAN.
However, there is ony "update" message that is triggered every 6 seconds, which
becomes especially verbose.

Suppress this one and only log it when compiled --with-more-logging. And then
only log with level LOGL_TRACE, so the user still can filter this one out.
This commit is contained in:
Thomas Haller 2017-02-17 20:32:42 +01:00
parent 2c9ef8cf2e
commit ae158bf178
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/devices/wifi/nm-device-wifi.c
View file

@ -191,6 +191,7 @@ static void _hw_addr_set_scanning (NMDeviceWifi *self, gboolean do_reset);
static void static void
_ap_dump (NMDeviceWifi *self, _ap_dump (NMDeviceWifi *self,
NMLogLevel log_level,
const NMWifiAP *ap, const NMWifiAP *ap,
const char *prefix, const char *prefix,
gint32 now_s) gint32 now_s)
@ -198,9 +199,9 @@ _ap_dump (NMDeviceWifi *self,
char buf[1024]; char buf[1024];
buf[0] = '\0'; buf[0] = '\0';
_LOGD (LOGD_WIFI_SCAN, "wifi-ap: %-7s %s", _NMLOG (log_level, LOGD_WIFI_SCAN, "wifi-ap: %-7s %s",
prefix, prefix,
nm_wifi_ap_to_string (ap, buf, sizeof (buf), now_s)); nm_wifi_ap_to_string (ap, buf, sizeof (buf), now_s));
} }
static void static void
@ -446,8 +447,11 @@ periodic_update (NMDeviceWifi *self)
/* Smooth out the strength to work around crappy drivers */ /* Smooth out the strength to work around crappy drivers */
percent = nm_platform_wifi_get_quality (NM_PLATFORM_GET, ifindex); percent = nm_platform_wifi_get_quality (NM_PLATFORM_GET, ifindex);
if (percent >= 0 || ++priv->invalid_strength_counter > 3) { if (percent >= 0 || ++priv->invalid_strength_counter > 3) {
if (nm_wifi_ap_set_strength (priv->current_ap, (gint8) percent)) if (nm_wifi_ap_set_strength (priv->current_ap, (gint8) percent)) {
_ap_dump (self, priv->current_ap, "updated", 0); #if NM_MORE_LOGGING
_ap_dump (self, LOGL_TRACE, priv->current_ap, "updated", 0);
#endif
}
priv->invalid_strength_counter = 0; priv->invalid_strength_counter = 0;
} }
} }
@ -480,9 +484,9 @@ ap_add_remove (NMDeviceWifi *self,
g_hash_table_insert (priv->aps, g_hash_table_insert (priv->aps,
(gpointer) nm_exported_object_export ((NMExportedObject *) ap), (gpointer) nm_exported_object_export ((NMExportedObject *) ap),
g_object_ref (ap)); g_object_ref (ap));
_ap_dump (self, ap, "added", 0); _ap_dump (self, LOGL_DEBUG, ap, "added", 0);
} else } else
_ap_dump (self, ap, "removed", 0); _ap_dump (self, LOGL_DEBUG, ap, "removed", 0);
g_signal_emit (self, signals[signum], 0, ap); g_signal_emit (self, signals[signum], 0, ap);
@ -1592,7 +1596,7 @@ ap_list_dump (gpointer user_data)
priv->scheduled_scan_time); priv->scheduled_scan_time);
list = ap_list_get_sorted (self, TRUE); list = ap_list_get_sorted (self, TRUE);
for (i = 0; list[i]; i++) for (i = 0; list[i]; i++)
_ap_dump (self, list[i], "dump", now_s); _ap_dump (self, LOGL_DEBUG, list[i], "dump", now_s);
} }
return G_SOURCE_REMOVE; return G_SOURCE_REMOVE;
} }
@ -1667,7 +1671,7 @@ supplicant_iface_bss_updated_cb (NMSupplicantInterface *iface,
if (found_ap) { if (found_ap) {
if (!nm_wifi_ap_update_from_properties (found_ap, object_path, properties)) if (!nm_wifi_ap_update_from_properties (found_ap, object_path, properties))
return; return;
_ap_dump (self, found_ap, "updated", 0); _ap_dump (self, LOGL_DEBUG, found_ap, "updated", 0);
} else { } else {
gs_unref_object NMWifiAP *ap = NULL; gs_unref_object NMWifiAP *ap = NULL;
@ -1730,7 +1734,7 @@ supplicant_iface_bss_removed_cb (NMSupplicantInterface *iface,
* indicate that this AP is now unknown to the supplicant. * indicate that this AP is now unknown to the supplicant.
*/ */
if (nm_wifi_ap_set_fake (ap, TRUE)) if (nm_wifi_ap_set_fake (ap, TRUE))
_ap_dump (self, ap, "updated", 0); _ap_dump (self, LOGL_DEBUG, ap, "updated", 0);
} else { } else {
ap_add_remove (self, ACCESS_POINT_REMOVED, ap, TRUE); ap_add_remove (self, ACCESS_POINT_REMOVED, ap, TRUE);
schedule_ap_list_dump (self); schedule_ap_list_dump (self);
@ -2523,7 +2527,7 @@ ensure_hotspot_frequency (NMDeviceWifi *self,
freq = (g_strcmp0 (band, "a") == 0) ? 5180 : 2462; freq = (g_strcmp0 (band, "a") == 0) ? 5180 : 2462;
if (nm_wifi_ap_set_freq (ap, freq)) if (nm_wifi_ap_set_freq (ap, freq))
_ap_dump (self, ap, "updated", 0); _ap_dump (self, LOGL_DEBUG, ap, "updated", 0);
} }
static void static void
@ -2895,7 +2899,7 @@ activation_success_handler (NMDevice *device)
ap_changed |= nm_wifi_ap_set_max_bitrate (priv->current_ap, nm_platform_wifi_get_rate (NM_PLATFORM_GET, ifindex)); ap_changed |= nm_wifi_ap_set_max_bitrate (priv->current_ap, nm_platform_wifi_get_rate (NM_PLATFORM_GET, ifindex));
if (ap_changed) if (ap_changed)
_ap_dump (self, priv->current_ap, "updated", 0); _ap_dump (self, LOGL_DEBUG, priv->current_ap, "updated", 0);
} }
nm_active_connection_set_specific_object (NM_ACTIVE_CONNECTION (req), nm_active_connection_set_specific_object (NM_ACTIVE_CONNECTION (req),