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

logging: one level at a time; levels are cumulative

Browse source
This commit is contained in:
Dan Williams 2010-04-06 15:53:37 -07:00
parent c0a455d344
commit d03de42350
1 changed files with 15 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/nm-logging.c
View file

@ -48,9 +48,9 @@ typedef struct {
static const LogDesc level_descs[] = {
{ LOGL_ERR, "ERR" },
{ LOGL_WARN, "WARN" },
{ LOGL_INFO, "INFO" },
{ LOGL_DEBUG, "DEBUG" },
{ LOGL_WARN | LOGL_ERR, "WARN" },
{ LOGL_INFO | LOGL_WARN | LOGL_ERR, "INFO" },
{ LOGL_DEBUG | LOGL_INFO | LOGL_WARN | LOGL_ERR, "DEBUG" },
{ 0, NULL }
};
@ -86,31 +86,25 @@ gboolean
nm_logging_setup (const char *level, const char *domains, GError **error)
{
char **tmp, **iter;
guint32 new_level = 0;
guint32 new_domains = 0;
/* levels */
if (level && strlen (level)) {
tmp = g_strsplit (level, ",", 0);
for (iter = tmp; iter && *iter; iter++) {
const LogDesc *diter;
gboolean found = FALSE;
gboolean found = FALSE;
const LogDesc *diter;
for (diter = &level_descs[0]; diter->name; diter++) {
if (!strcasecmp (diter->name, *iter)) {
new_level &= diter->num;
found = TRUE;
break;
}
}
if (!found) {
g_set_error (error, 0, 0, _("Unknown log level '%s'"), *iter);
return FALSE;
for (diter = &level_descs[0]; diter->name; diter++) {
if (!strcasecmp (diter->name, level)) {
log_level = diter->num;
found = TRUE;
break;
}
}
g_strfreev (tmp);
log_level = new_level;
if (!found) {
g_set_error (error, 0, 0, _("Unknown log level '%s'"), level);
return FALSE;
}
}
/* domains */