case "${words[0]}" in
level)
if [[ "${#words[@]}" -eq 2 ]]; then
- _nmcli_list "ERR WARN INFO DEBUG TRACE"
+ _nmcli_list "OFF ERR WARN INFO DEBUG TRACE"
return 0
fi
;;
<varlistentry>
<term><varname>level</varname></term>
<listitem><para>The default logging verbosity level.
- One of <literal>ERR</literal>,
+ One of <literal>OFF</literal>, <literal>ERR</literal>,
<literal>WARN</literal>, <literal>INFO</literal>,
<literal>DEBUG</literal>, <literal>TRACE</literal>. The ERR
level logs only critical errors. WARN logs warnings that may
ALL, DEFAULT, DHCP, IP.</para>
<para>You can specify per-domain log level overrides by
adding a colon and a log level to any domain. E.g.,
- "<literal>WIFI:DEBUG</literal>".</para></listitem>
+ "<literal>WIFI:DEBUG,WIFI_SCAN:OFF</literal>".</para></listitem>
</varlistentry>
<varlistentry>
<para>Domain descriptions:
static NMLogLevel log_level = LOGL_INFO;
static char *log_domains;
-static NMLogDomain logging[_LOGL_N];
+static NMLogDomain logging[_LOGL_N_REAL];
static gboolean logging_set_up;
enum {
LOG_BACKEND_GLIB,
[LOGL_INFO] = { "INFO", "<info>", LOG_INFO, G_LOG_LEVEL_MESSAGE, FALSE },
[LOGL_WARN] = { "WARN", "<warn>", LOG_WARNING, G_LOG_LEVEL_WARNING, FALSE },
[LOGL_ERR] = { "ERR", "<error>", LOG_ERR, G_LOG_LEVEL_WARNING, TRUE },
+ [_LOGL_OFF] = { "OFF", NULL, 0, 0, FALSE },
};
static const LogDesc domain_descs[] = {
continue;
}
- for (i = 0; i < domain_log_level; i++)
- new_logging[i] &= ~bits;
- for (i = domain_log_level; i < _LOGL_N; i++)
- new_logging[i] |= bits;
+ for (i = 0; i < G_N_ELEMENTS (new_logging); i++) {
+ if (i < domain_log_level)
+ new_logging[i] &= ~bits;
+ else
+ new_logging[i] |= bits;
+ }
}
g_strfreev (tmp);
LOGL_WARN,
LOGL_ERR,
- _LOGL_N, /* the number of logging levels */
+ _LOGL_N_REAL, /* the number of actual logging levels */
+
+ _LOGL_OFF = _LOGL_N_REAL, /* special logging level that is always disabled. */
+
+ _LOGL_N, /* the number of logging levels including "OFF" */
} NMLogLevel;
#define nm_log_err(domain, ...) nm_log (LOGL_ERR, (domain), __VA_ARGS__)