diff options
| author | Aleksander Morgado <aleksander@aleksander.es> | 2020-10-25 16:32:23 +0100 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2020-11-08 14:49:51 +0100 |
| commit | 11ee6a86071dda5bc139a28bd73483fa4a30f161 (patch) | |
| tree | 2727a0dfc3ce668bea9a2ab303d09964ab4b4592 | |
| parent | 6e8f36a619beff8f193701d56ea62645b03a4c0f (diff) | |
| download | ModemManager-11ee6a86071dda5bc139a28bd73483fa4a30f161.tar.gz | |
log: ignore fatal flag for logging purposes
Running with G_DEBUG=fatal-warnings will end up reporting warning logs
with G_LOG_FLAG_FATAL, which breaks our own logging logic.
(cherry picked from commit a31d762250edba7bbad34adec051d9cff0279f66)
| -rw-r--r-- | src/mm-log.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/mm-log.c b/src/mm-log.c index 658e0c128..8945b8917 100644 --- a/src/mm-log.c +++ b/src/mm-log.c @@ -100,6 +100,11 @@ mm_to_syslog_priority (MMLogLevel level) static int glib_to_syslog_priority (GLogLevelFlags level) { + /* if the log was flagged as fatal (e.g. G_DEBUG=fatal-warnings), ignore + * the fatal flag for logging purposes */ + if (level & G_LOG_FLAG_FATAL) + level &= ~G_LOG_FLAG_FATAL; + switch (level) { case G_LOG_LEVEL_ERROR: return LOG_CRIT; |