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

log: ensure that warnings from pw/spa are printed as warnings

Browse Source 
converting a spa log level to a native log level is not trivial, it seems;
when we want to print a message, we should map 2 (WARN) to W, but when we
want to translate WIREPLUMBER_DEBUG=2 to a log level, we should map 2 to N
This commit is contained in:
George Kiagiadakis
2023-05-25 18:25:41 +03:00
parent 70980fe355
commit d755ec4f20
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/wp/log.c
View File

@@ -276,15 +276,19 @@ level_index_to_full_flags (gint lvl_index)
} }
/* map a SPA_LOG_LEVEL_* to an index in the log_level_info table; /* map a SPA_LOG_LEVEL_* to an index in the log_level_info table;
note that SPA_LOG_LEVEL_WARN maps to 4 (G_LOG_LEVEL_MESSAGE) and if warn_to_notice == TRUE, SPA_LOG_LEVEL_WARN maps to 4 (G_LOG_LEVEL_MESSAGE)
index 3 (G_LOG_LEVEL_WARNING) can never be returned */ and index 3 (G_LOG_LEVEL_WARNING) can not be returned
if warn_to_notice == FALSE, SPA_LOG_LEVEL_WARN maps to 3 (G_LOG_LEVEL_WARNING)
and index 4 (G_LOG_LEVEL_MESSAGE) can not be returned */
static G_GNUC_CONST inline gint static G_GNUC_CONST inline gint
level_index_from_spa (gint spa_lvl) level_index_from_spa (gint spa_lvl, gboolean warn_to_notice)
{ {
if (G_UNLIKELY (spa_lvl <= SPA_LOG_LEVEL_NONE)) if (G_UNLIKELY (spa_lvl <= SPA_LOG_LEVEL_NONE))
return 1; return 1;
else if (spa_lvl < SPA_LOG_LEVEL_WARN) else if (spa_lvl == SPA_LOG_LEVEL_ERROR)
return spa_lvl + 1; return 2;
else if (spa_lvl == SPA_LOG_LEVEL_WARN)
return warn_to_notice ? 4 : 3;
else if (G_UNLIKELY (spa_lvl > SPA_LOG_LEVEL_TRACE)) else if (G_UNLIKELY (spa_lvl > SPA_LOG_LEVEL_TRACE))
return (gint) G_N_ELEMENTS (log_level_info) - 1; return (gint) G_N_ELEMENTS (log_level_info) - 1;
else else
@@ -314,7 +318,7 @@ level_index_from_string (const char *str, gint *lvl)
} }
if (str[0] >= '0' && str[0] <= '5') { if (str[0] >= '0' && str[0] <= '5') {
*lvl = level_index_from_spa (str[0] - '0'); *lvl = level_index_from_spa (str[0] - '0', TRUE);
return TRUE; return TRUE;
} }
} }
@@ -707,7 +711,7 @@ wp_spa_log_logtv (void *object,
va_list args) va_list args)
{ {
WpLogFields lf = {0}; WpLogFields lf = {0};
gint log_level = level_index_from_spa (level); gint log_level = level_index_from_spa (level, FALSE);
g_autofree gchar *message = NULL; g_autofree gchar *message = NULL;
gchar line_str[11]; gchar line_str[11];