osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

wslog: Make error and critical levels not conditional

This commit is contained in:
João Valverde 2021-06-12 02:27:43 +01:00
parent 700d8e34db
commit 55f0fba85d
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
wsutil/wslog.c
View File

@ -20,13 +20,13 @@
#define PREFIX_BUFSIZE 128
#define _ENV_LEVEL "WIRESHARK_LOG_LEVEL"
#define _ENV_DOMAINS "WIRESHARK_LOG_DOMAINS"
#define ENV_VAR_LEVEL "WIRESHARK_LOG_LEVEL"
#define ENV_VAR_DOMAINS "WIRESHARK_LOG_DOMAINS"
#define DEFAULT_LOG_LEVEL LOG_LEVEL_MESSAGE
/* TODO: Add filtering by domain. */
static enum ws_log_level current_log_level = LOG_LEVEL_MESSAGE;
static enum ws_log_level current_log_level = LOG_LEVEL_NONE;
GPtrArray *domain_filter = NULL;
@ -99,6 +99,9 @@ gboolean ws_log_domain_is_active(const char *domain)
static gboolean log_drop_message(const char *domain, enum ws_log_level level)
{
if (level <= LOG_LEVEL_CRITICAL)
return FALSE;
return !ws_log_level_is_active(level) || !ws_log_domain_is_active(domain);
}
@ -161,6 +164,7 @@ static const char *log_prune_argv(int count, char **ptr, int prune_extra,
return optarg;
}
const char *log_parse_args(int *argc_ptr, char *argv[], const char *optstr)
{
char **p;
@ -236,6 +240,7 @@ void ws_log_set_domain_filter_str(const char *str_filter)
g_free(str);
}
void ws_log_set_domain_filter_args(int *argc_ptr, char *argv[])
{
const char *optval = NULL;
@ -250,19 +255,20 @@ void ws_log_set_domain_filter_args(int *argc_ptr, char *argv[])
void ws_log_init(ws_log_writer_cb *_writer)
{
if (_writer) {
if (_writer)
registered_log_writer = _writer;
}
const char *env;
env = g_getenv(_ENV_LEVEL);
if (env && ws_log_set_level_str(env) == LOG_LEVEL_NONE) {
fprintf(stderr, "Ignoring invalid environment value %s=\"%s\"\n", _ENV_LEVEL, env);
current_log_level = DEFAULT_LOG_LEVEL;
env = g_getenv(ENV_VAR_LEVEL);
if (env != NULL && ws_log_set_level_str(env) == LOG_LEVEL_NONE) {
fprintf(stderr, "Ignoring invalid environment value %s=\"%s\"\n", ENV_VAR_LEVEL, env);
}
env = g_getenv(_ENV_DOMAINS);
if (env)
env = g_getenv(ENV_VAR_DOMAINS);
if (env != NULL)
ws_log_set_domain_filter_str(env);
atexit(ws_log_cleanup);

1
wsutil/wslog.h
View File

@ -149,6 +149,7 @@ WS_DLL_PUBLIC
void ws_log(const char *domain, enum ws_log_level level,
const char *format, ...) G_GNUC_PRINTF(3,4);
/** This function is called to output a message to the log.
*
* Takes a format string and a 'va_list'.