fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-25 08:20:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

logging: factor our construction of logging message in _nm_log_impl()

Browse source
This commit is contained in:
Thomas Haller 2015-07-08 17:28:22 +02:00
parent 831a5e32fb
commit b1b26e8049
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/nm-logging.c
View file

@ -379,6 +379,8 @@ _nm_log_impl (const char *file,
GTimeVal tv;
int syslog_level = LOG_INFO;
int g_log_level = G_LOG_LEVEL_INFO;
gboolean full_details = FALSE;
const char *level_str = NULL;
g_return_if_fail (level < LOGL_MAX);
@ -397,38 +399,44 @@ _nm_log_impl (const char *file,
switch (level) {
case LOGL_TRACE:
g_get_current_time (&tv);
syslog_level = LOG_DEBUG;
g_log_level = G_LOG_LEVEL_DEBUG;
fullmsg = g_strdup_printf ("<trace> [%ld.%06ld] [%s:%u] %s(): %s", tv.tv_sec, tv.tv_usec, file, line, func, msg);
full_details = TRUE;
level_str = "<trace>";
break;
case LOGL_DEBUG:
g_get_current_time (&tv);
syslog_level = LOG_INFO;
g_log_level = G_LOG_LEVEL_DEBUG;
fullmsg = g_strdup_printf ("<debug> [%ld.%06ld] [%s:%u] %s(): %s", tv.tv_sec, tv.tv_usec, file, line, func, msg);
full_details = TRUE;
level_str = "<debug>";
break;
case LOGL_INFO:
syslog_level = LOG_INFO;
g_log_level = G_LOG_LEVEL_MESSAGE;
fullmsg = g_strconcat ("<info> ", msg, NULL);
level_str = "<info>";
break;
case LOGL_WARN:
syslog_level = LOG_WARNING;
g_log_level = G_LOG_LEVEL_WARNING;
fullmsg = g_strconcat ("<warn> ", msg, NULL);
level_str = "<warn>";
break;
case LOGL_ERR:
syslog_level = LOG_ERR;
/* g_log_level is still WARNING, because ERROR is fatal */
g_log_level = G_LOG_LEVEL_WARNING;
g_get_current_time (&tv);
fullmsg = g_strdup_printf ("<error> [%ld.%06ld] [%s:%u] %s(): %s", tv.tv_sec, tv.tv_usec, file, line, func, msg);
full_details = TRUE;
level_str = "<error>";
break;
default:
g_assert_not_reached ();
g_return_if_reached ();
}
if (full_details) {
g_get_current_time (&tv);
fullmsg = g_strdup_printf ("%-7s [%ld.%06ld] [%s:%u] %s(): %s", level_str, tv.tv_sec, tv.tv_usec, file, line, func, msg);
} else
fullmsg = g_strdup_printf ("%-7s %s", level_str, msg);
switch (log_backend) {
case LOG_BACKEND_SYSLOG:
syslog (syslog_level, "%s", fullmsg);