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

connectivity: only enable verbose libcurl debug logging with "NM_LOG_CONCHECK" environment

Browse source 
For regular operation -- even for `level=TRACE` -- it's just too verbose.
Only enable it if the environment "NM_LOG_CONCHECK=1" is set.

An environment variable is a bit unwieldy to use, but this
is really just for a heavy libcurl debugging session.
This commit is contained in:
Thomas Haller 2022-04-01 18:53:58 +02:00
parent 1dc16931be
commit a892746578
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/core/nm-connectivity.c
View file

@ -623,6 +623,25 @@ _timeout_cb(gpointer user_data)
return G_SOURCE_REMOVE;
}
static gboolean
easy_debug_enabled(void)
{
static int enabled = 0;
int e;
/* libcurl debug logging can be useful, but is very verbose.
* Only enable it when we have a certain environment variable set. */
again:
e = g_atomic_int_get(&enabled);
if (G_UNLIKELY(e == 0)) {
e = _nm_utils_ascii_str_to_bool(g_getenv("NM_LOG_CONCHECK"), FALSE) ? 1 : -1;
if (G_UNLIKELY(!g_atomic_int_compare_and_exchange(&enabled, 0, e)))
goto again;
}
return e >= 0;
}
static int
easy_debug_cb(CURL *handle, curl_infotype type, char *data, size_t size, void *userptr)
{
@ -750,7 +769,7 @@ do_curl_request(NMConnectivityCheckHandle *cb_data, const char *hosts)
curl_easy_setopt(ehandle, CURLOPT_RESOLVE, cb_data->concheck.hosts);
curl_easy_setopt(ehandle, CURLOPT_IPRESOLVE, resolve);
curl_easy_setopt(ehandle, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
if (_LOGT_ENABLED()) {
if (_LOGT_ENABLED() && easy_debug_enabled()) {
curl_easy_setopt(ehandle, CURLOPT_DEBUGFUNCTION, easy_debug_cb);
curl_easy_setopt(ehandle, CURLOPT_DEBUGDATA, cb_data);
curl_easy_setopt(ehandle, CURLOPT_VERBOSE, 1L);