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

logging: fix multiple log level handling

Browse Source 
Ensure messages are only printed in the format their log level wants.
This commit is contained in:
Dan Williams
2010-04-07 14:43:32 -07:00
parent 6602813ffb
commit 4e5cfab478
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/logging/nm-logging.c
View File

@@ -158,14 +158,14 @@ void _nm_log (const char *loc,
msg = g_strdup_vprintf (fmt, args); msg = g_strdup_vprintf (fmt, args);
va_end (args); va_end (args);
if (log_level & LOGL_DEBUG) { if ((log_level & LOGL_DEBUG) && (level == LOGL_DEBUG)) {
g_get_current_time (&tv); g_get_current_time (&tv);
syslog (LOG_DEBUG, "<debug> [%zu.%zu] [%s] %s(): %s\n", tv.tv_sec, tv.tv_usec, loc, func, msg); syslog (LOG_DEBUG, "<debug> [%zu.%zu] [%s] %s(): %s\n", tv.tv_sec, tv.tv_usec, loc, func, msg);
} else if (log_level & LOGL_INFO) } else if ((log_level & LOGL_INFO) && (level == LOGL_INFO))
syslog (LOG_INFO, "<info> %s\n", msg); syslog (LOG_INFO, "<info> %s\n", msg);
else if (log_level & LOGL_WARN) else if ((log_level & LOGL_WARN) && (level == LOGL_WARN))
syslog (LOG_WARNING, "<warn> %s\n", msg); syslog (LOG_WARNING, "<warn> %s\n", msg);
else if (log_level & LOGL_ERR) { else if ((log_level & LOGL_ERR) && (level == LOGL_ERR)) {
g_get_current_time (&tv); g_get_current_time (&tv);
syslog (LOG_ERR, "<error> [%zu.%zu] [%s] %s(): %s\n", tv.tv_sec, tv.tv_usec, loc, func, msg); syslog (LOG_ERR, "<error> [%zu.%zu] [%s] %s(): %s\n", tv.tv_sec, tv.tv_usec, loc, func, msg);
} }