From b3f315ad2db5455156781f1cfc22ecfb46bc389e Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Fri, 5 Aug 2022 14:40:24 +0200 Subject: core,log: new 'MSG' log level between 'INFO' and 'WARN' We're bumping the current "INFO" level messages to the new "MSG" level, also making the new level the default. The old "INFO" level will be used to setup an intermediate level of logging which is not as verbose as "DEBUG" but still provides some capabilities to analyze the behavior of a modem. --- src/mm-log.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'src/mm-log.c') diff --git a/src/mm-log.c b/src/mm-log.c index 26260b7c..e8a058c1 100644 --- a/src/mm-log.c +++ b/src/mm-log.c @@ -52,7 +52,7 @@ enum { }; static gboolean ts_flags = TS_FLAG_NONE; -static guint32 log_level = MM_LOG_LEVEL_INFO | MM_LOG_LEVEL_WARN | MM_LOG_LEVEL_ERR; +static guint32 log_level = MM_LOG_LEVEL_MSG | MM_LOG_LEVEL_WARN | MM_LOG_LEVEL_ERR; static GTimeVal rel_start = { 0, 0 }; static int logfd = -1; static gboolean append_log_level_text = TRUE; @@ -71,8 +71,10 @@ typedef struct { static const LogDesc level_descs[] = { { MM_LOG_LEVEL_ERR, "ERR" }, { MM_LOG_LEVEL_WARN | MM_LOG_LEVEL_ERR, "WARN" }, - { MM_LOG_LEVEL_INFO | MM_LOG_LEVEL_WARN | MM_LOG_LEVEL_ERR, "INFO" }, - { MM_LOG_LEVEL_DEBUG | MM_LOG_LEVEL_INFO | MM_LOG_LEVEL_WARN | MM_LOG_LEVEL_ERR, "DEBUG" }, + { MM_LOG_LEVEL_MSG | MM_LOG_LEVEL_WARN | MM_LOG_LEVEL_ERR, "MSG" }, + { MM_LOG_LEVEL_INFO | MM_LOG_LEVEL_MSG | MM_LOG_LEVEL_WARN | MM_LOG_LEVEL_ERR, "INFO" }, + { MM_LOG_LEVEL_DEBUG | MM_LOG_LEVEL_INFO | MM_LOG_LEVEL_MSG | MM_LOG_LEVEL_WARN | MM_LOG_LEVEL_ERR, "DEBUG" }, + { 0, NULL } }; static GString *msgbuf = NULL; @@ -86,6 +88,8 @@ mm_to_syslog_priority (MMLogLevel level) return LOG_ERR; case MM_LOG_LEVEL_WARN: return LOG_WARNING; + case MM_LOG_LEVEL_MSG: + return LOG_NOTICE; case MM_LOG_LEVEL_INFO: return LOG_INFO; case MM_LOG_LEVEL_DEBUG: @@ -112,6 +116,7 @@ glib_level_to_mm_level (GLogLevelFlags level) case G_LOG_LEVEL_WARNING: return MM_LOG_LEVEL_WARN; case G_LOG_LEVEL_MESSAGE: + return MM_LOG_LEVEL_MSG; case G_LOG_LEVEL_INFO: return MM_LOG_LEVEL_INFO; case G_LOG_LEVEL_DEBUG: @@ -132,6 +137,8 @@ log_level_description (MMLogLevel level) return ""; case MM_LOG_LEVEL_WARN: return " "; + case MM_LOG_LEVEL_MSG: + return " "; case MM_LOG_LEVEL_INFO: return " "; case MM_LOG_LEVEL_DEBUG: -- cgit v1.2.3-70-g09d2