fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-09 00:40:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

logging: use GLib's logging functions if not using syslog

Browse source 
If nm_logging_syslog_openlog() isn't called (ie, in the test
programs), then route nm_log() messages to g_log() rather than just
using fprintf().
This commit is contained in:
Dan Winship 2014-04-05 09:38:59 -04:00
parent 4618a07304
commit a4b8645a60
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/logging/nm-logging.c
View file

@ -57,6 +57,7 @@ nm_log_handler (const gchar *log_domain,
static guint32 log_level = LOGL_INFO;
static char *log_domains;
static guint64 logging[LOGL_MAX];
static gboolean logging_set_up;
static gboolean syslog_opened;
typedef struct {
@ -163,6 +164,8 @@ nm_logging_setup (const char *level,
char **tmp, **iter;
int i;
logging_set_up = TRUE;
for (i = 0; i < LOGL_MAX; i++)
new_logging[i] = 0;
@ -368,9 +371,13 @@ _nm_log (const char *loc,
char *fullmsg = NULL;
GTimeVal tv;
int syslog_level = LOG_INFO;
int g_log_level = G_LOG_LEVEL_INFO;
g_return_if_fail (level < LOGL_MAX);
if (G_UNLIKELY (!logging_set_up))
nm_logging_setup ("INFO", "DEFAULT", NULL, NULL);
if (!(logging[level] & domain))
return;
@ -382,18 +389,23 @@ _nm_log (const char *loc,
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] %s(): %s", tv.tv_sec, tv.tv_usec, loc, func, msg);
break;
case LOGL_INFO:
syslog_level = LOG_INFO;
g_log_level = G_LOG_LEVEL_MESSAGE;
fullmsg = g_strconcat ("<info> ", msg, NULL);
break;
case LOGL_WARN:
syslog_level = LOG_WARNING;
g_log_level = G_LOG_LEVEL_WARNING;
fullmsg = g_strconcat ("<warn> ", msg, NULL);
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] %s(): %s", tv.tv_sec, tv.tv_usec, loc, func, msg);
break;
@ -403,14 +415,8 @@ _nm_log (const char *loc,
if (syslog_opened)
syslog (syslog_level, "%s", fullmsg);
else {
FILE *log_target;
if (level == LOGL_WARN || level == LOGL_ERR)
log_target = stderr;
else
log_target = stdout;
fprintf (log_target, "%s\n", fullmsg);
}
else
g_log (G_LOG_DOMAIN, g_log_level, "%s", fullmsg);
g_free (msg);
g_free (fullmsg);