logging: move logging into its own subdir
Some stuff we build (the DHCP manager) gets built independently so that we can use it for unit tests. For that, we need to build the logging bits separately too, since the independent DHCP library can't use them if they are embedded in NM.
This commit is contained in:
Dan Williams
14
src/logging/Makefile.am
Normal file
14
src/logging/Makefile.am
Normal file
@@ -0,0 +1,14 @@
|
||||
noinst_LTLIBRARIES = libnm-logging.la
|
||||
|
||||
libnm_logging_la_SOURCES = \
|
||||
nm-logging.c \
|
||||
nm-logging.h
|
||||
|
||||
libnm_logging_la_CPPFLAGS = \
|
||||
$(GLIB_CFLAGS) \
|
||||
-DLIBEXECDIR=\"$(libexecdir)\" \
|
||||
-DG_DISABLE_DEPRECATED
|
||||
|
||||
libnm_logging_la_LIBADD = \
|
||||
$(GLIB_LIBS)
|
||||
|
||||
304
src/logging/nm-logging.c
Normal file
304
src/logging/nm-logging.c
Normal file
@@ -0,0 +1,304 @@
|
||||
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
|
||||
/* NetworkManager -- Network link manager
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Copyright (C) 2006 - 2010 Red Hat, Inc.
|
||||
* Copyright (C) 2006 - 2008 Novell, Inc.
|
||||
*/
|
||||
|
||||
#define _GNU_SOURCE
|
||||
#include <dlfcn.h>
|
||||
#include <syslog.h>
|
||||
#include <execinfo.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <errno.h>
|
||||
#include <sys/wait.h>
|
||||
#include <sys/stat.h>
|
||||
#include <execinfo.h>
|
||||
#include <strings.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <glib/gi18n.h>
|
||||
|
||||
#include "nm-logging.h"
|
||||
|
||||
static guint32 log_level = LOGL_INFO;
|
||||
static guint32 log_domains = \
|
||||
LOGD_CORE | LOGD_HW | LOGD_RFKILL | LOGD_SUSPEND | LOGD_MB | LOGD_BT;
|
||||
|
||||
typedef struct {
|
||||
guint32 num;
|
||||
const char *name;
|
||||
} LogDesc;
|
||||
|
||||
static const LogDesc level_descs[] = {
|
||||
{ LOGL_ERR, "ERR" },
|
||||
{ LOGL_WARN | LOGL_ERR, "WARN" },
|
||||
{ LOGL_INFO | LOGL_WARN | LOGL_ERR, "INFO" },
|
||||
{ LOGL_DEBUG | LOGL_INFO | LOGL_WARN | LOGL_ERR, "DEBUG" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
static const LogDesc domain_descs[] = {
|
||||
{ LOGD_NONE, "NONE" },
|
||||
{ LOGD_HW, "HW" },
|
||||
{ LOGD_RFKILL, "RFKILL" },
|
||||
{ LOGD_ETHER, "ETHER" },
|
||||
{ LOGD_WIFI, "WIFI" },
|
||||
{ LOGD_BT, "BT" },
|
||||
{ LOGD_MB, "MB" },
|
||||
{ LOGD_DHCP4, "DHCP4" },
|
||||
{ LOGD_DHCP6, "DHCP6" },
|
||||
{ LOGD_PPP, "PPP" },
|
||||
{ LOGD_WIFI_SCAN, "WIFI_SCAN" },
|
||||
{ LOGD_IP4, "IP4" },
|
||||
{ LOGD_IP6, "IP6" },
|
||||
{ LOGD_AUTOIP4, "AUTOIP4" },
|
||||
{ LOGD_DNS, "DNS" },
|
||||
{ LOGD_VPN, "VPN" },
|
||||
{ LOGD_SHARING, "SHARING" },
|
||||
{ LOGD_SUPPLICANT,"SUPPLICANT" },
|
||||
{ LOGD_USER_SET, "USER_SET" },
|
||||
{ LOGD_SYS_SET, "SYS_SET" },
|
||||
{ LOGD_SUSPEND, "SUSPEND" },
|
||||
{ LOGD_CORE, "CORE" },
|
||||
{ LOGD_DEVICE, "DEVICE" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
|
||||
/************************************************************************/
|
||||
|
||||
gboolean
|
||||
nm_logging_setup (const char *level, const char *domains, GError **error)
|
||||
{
|
||||
char **tmp, **iter;
|
||||
guint32 new_domains = 0;
|
||||
|
||||
/* levels */
|
||||
if (level && strlen (level)) {
|
||||
gboolean found = FALSE;
|
||||
const LogDesc *diter;
|
||||
|
||||
for (diter = &level_descs[0]; diter->name; diter++) {
|
||||
if (!strcasecmp (diter->name, level)) {
|
||||
log_level = diter->num;
|
||||
found = TRUE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!found) {
|
||||
g_set_error (error, 0, 0, _("Unknown log level '%s'"), level);
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
|
||||
/* domains */
|
||||
if (domains && strlen (domains)) {
|
||||
tmp = g_strsplit (domains, ",", 0);
|
||||
for (iter = tmp; iter && *iter; iter++) {
|
||||
const LogDesc *diter;
|
||||
gboolean found = FALSE;
|
||||
|
||||
for (diter = &domain_descs[0]; diter->name; diter++) {
|
||||
if (!strcasecmp (diter->name, *iter)) {
|
||||
new_domains &= diter->num;
|
||||
found = TRUE;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!found) {
|
||||
g_set_error (error, 0, 0, _("Unknown log domain '%s'"), *iter);
|
||||
return FALSE;
|
||||
}
|
||||
}
|
||||
g_strfreev (tmp);
|
||||
log_domains = new_domains;
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
void _nm_log (const char *loc,
|
||||
const char *func,
|
||||
guint32 domain,
|
||||
guint32 level,
|
||||
const char *fmt,
|
||||
...)
|
||||
{
|
||||
va_list args;
|
||||
char *msg;
|
||||
GTimeVal tv;
|
||||
|
||||
if (!(log_level & level) || !(log_domains & domain))
|
||||
return;
|
||||
|
||||
va_start (args, fmt);
|
||||
msg = g_strdup_vprintf (fmt, args);
|
||||
va_end (args);
|
||||
|
||||
if (log_level & LOGL_DEBUG) {
|
||||
g_get_current_time (&tv);
|
||||
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)
|
||||
syslog (LOG_INFO, "<info> %s\n", msg);
|
||||
else if (log_level & LOGL_WARN)
|
||||
syslog (LOG_WARNING, "<warn> %s\n", msg);
|
||||
else if (log_level & LOGL_ERR) {
|
||||
g_get_current_time (&tv);
|
||||
syslog (LOG_ERR, "<error> [%zu.%zu] [%s] %s(): %s\n", tv.tv_sec, tv.tv_usec, loc, func, msg);
|
||||
}
|
||||
g_free (msg);
|
||||
}
|
||||
|
||||
/************************************************************************/
|
||||
|
||||
static void
|
||||
fallback_get_backtrace (void)
|
||||
{
|
||||
void *frames[64];
|
||||
Dl_info info;
|
||||
size_t size;
|
||||
guint32 i;
|
||||
const char *name;
|
||||
|
||||
size = backtrace (frames, G_N_ELEMENTS (frames));
|
||||
|
||||
syslog (LOG_CRIT, "******************* START **********************************");
|
||||
for (i = 0; i < size; i++) {
|
||||
dladdr (frames[i], &info);
|
||||
name = (info.dli_fname && *info.dli_fname) ? info.dli_fname : "(vdso)";
|
||||
if (info.dli_saddr) {
|
||||
syslog (LOG_CRIT, "Frame %d: %s (%s+0x%lx) [%p]",
|
||||
i, name,
|
||||
info.dli_sname,
|
||||
(gulong)(frames[i] - info.dli_saddr),
|
||||
frames[i]);
|
||||
} else {
|
||||
syslog (LOG_CRIT, "Frame %d: %s (%p+0x%lx) [%p]",
|
||||
i, name,
|
||||
info.dli_fbase,
|
||||
(gulong)(frames[i] - info.dli_saddr),
|
||||
frames[i]);
|
||||
}
|
||||
}
|
||||
syslog (LOG_CRIT, "******************* END **********************************");
|
||||
}
|
||||
|
||||
|
||||
static gboolean
|
||||
crashlogger_get_backtrace (void)
|
||||
{
|
||||
gboolean success = FALSE;
|
||||
int pid;
|
||||
|
||||
pid = fork();
|
||||
if (pid > 0)
|
||||
{
|
||||
/* Wait for the child to finish */
|
||||
int estatus;
|
||||
if (waitpid (pid, &estatus, 0) != -1)
|
||||
{
|
||||
/* Only succeed if the crashlogger succeeded */
|
||||
if (WIFEXITED (estatus) && (WEXITSTATUS (estatus) == 0))
|
||||
success = TRUE;
|
||||
}
|
||||
}
|
||||
else if (pid == 0)
|
||||
{
|
||||
/* Child process */
|
||||
execl (LIBEXECDIR"/nm-crash-logger",
|
||||
LIBEXECDIR"/nm-crash-logger", NULL);
|
||||
}
|
||||
|
||||
return success;
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
nm_logging_backtrace (void)
|
||||
{
|
||||
struct stat s;
|
||||
gboolean fallback = TRUE;
|
||||
|
||||
/* Try to use gdb via nm-crash-logger if it exists, since
|
||||
* we get much better information out of it. Otherwise
|
||||
* fall back to execinfo.
|
||||
*/
|
||||
if (stat (LIBEXECDIR"/nm-crash-logger", &s) == 0)
|
||||
fallback = crashlogger_get_backtrace () ? FALSE : TRUE;
|
||||
|
||||
if (fallback)
|
||||
fallback_get_backtrace ();
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
nm_log_handler (const gchar *log_domain,
|
||||
GLogLevelFlags level,
|
||||
const gchar *message,
|
||||
gpointer ignored)
|
||||
{
|
||||
int syslog_priority;
|
||||
|
||||
switch (level) {
|
||||
case G_LOG_LEVEL_ERROR:
|
||||
syslog_priority = LOG_CRIT;
|
||||
break;
|
||||
case G_LOG_LEVEL_CRITICAL:
|
||||
syslog_priority = LOG_ERR;
|
||||
break;
|
||||
case G_LOG_LEVEL_WARNING:
|
||||
syslog_priority = LOG_WARNING;
|
||||
break;
|
||||
case G_LOG_LEVEL_MESSAGE:
|
||||
syslog_priority = LOG_NOTICE;
|
||||
break;
|
||||
case G_LOG_LEVEL_DEBUG:
|
||||
syslog_priority = LOG_DEBUG;
|
||||
break;
|
||||
case G_LOG_LEVEL_INFO:
|
||||
default:
|
||||
syslog_priority = LOG_INFO;
|
||||
break;
|
||||
}
|
||||
|
||||
syslog (syslog_priority, "%s", message);
|
||||
}
|
||||
|
||||
void
|
||||
nm_logging_start (gboolean become_daemon)
|
||||
{
|
||||
if (become_daemon)
|
||||
openlog (G_LOG_DOMAIN, 0, LOG_DAEMON);
|
||||
else
|
||||
openlog (G_LOG_DOMAIN, LOG_CONS | LOG_PERROR, LOG_USER);
|
||||
|
||||
g_log_set_handler (G_LOG_DOMAIN,
|
||||
G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL | G_LOG_FLAG_RECURSION,
|
||||
nm_log_handler,
|
||||
NULL);
|
||||
}
|
||||
|
||||
void
|
||||
nm_logging_shutdown (void)
|
||||
{
|
||||
closelog ();
|
||||
}
|
||||
98
src/logging/nm-logging.h
Normal file
98
src/logging/nm-logging.h
Normal file
@@ -0,0 +1,98 @@
|
||||
/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
|
||||
/* NetworkManager -- Network link manager
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Copyright (C) 2006 - 2010 Red Hat, Inc.
|
||||
* Copyright (C) 2006 - 2008 Novell, Inc.
|
||||
*/
|
||||
|
||||
#ifndef NM_LOGGING_H
|
||||
#define NM_LOGGING_H
|
||||
|
||||
#include <glib.h>
|
||||
|
||||
/* Log domains */
|
||||
enum {
|
||||
LOGD_NONE = 0x00000000,
|
||||
LOGD_HW = 0x00000001,
|
||||
LOGD_RFKILL = 0x00000002,
|
||||
LOGD_ETHER = 0x00000004,
|
||||
LOGD_WIFI = 0x00000008,
|
||||
LOGD_BT = 0x00000010,
|
||||
LOGD_MB = 0x00000020, /* mobile broadband */
|
||||
LOGD_DHCP4 = 0x00000040,
|
||||
LOGD_DHCP6 = 0x00000080,
|
||||
LOGD_PPP = 0x00000100,
|
||||
LOGD_WIFI_SCAN = 0x00000200,
|
||||
LOGD_IP4 = 0x00000400,
|
||||
LOGD_IP6 = 0x00000800,
|
||||
LOGD_AUTOIP4 = 0x00001000,
|
||||
LOGD_DNS = 0x00002000,
|
||||
LOGD_VPN = 0x00004000,
|
||||
LOGD_SHARING = 0x00008000,
|
||||
LOGD_SUPPLICANT = 0x00010000,
|
||||
LOGD_USER_SET = 0x00020000,
|
||||
LOGD_SYS_SET = 0x00040000,
|
||||
LOGD_SUSPEND = 0x00080000,
|
||||
LOGD_CORE = 0x00100000, /* Core daemon and policy stuff */
|
||||
LOGD_DEVICE = 0x00200000, /* Device state and activation */
|
||||
};
|
||||
|
||||
/* Log levels */
|
||||
enum {
|
||||
LOGL_ERR = 0x00000000,
|
||||
LOGL_WARN = 0x00000001,
|
||||
LOGL_INFO = 0x00000002,
|
||||
LOGL_DEBUG = 0x00000004
|
||||
};
|
||||
|
||||
#define nm_log_err(domain, fmt, args...) \
|
||||
{ _nm_log (G_STRFUNC, G_STRLOC, domain, LOGL_ERR, fmt, ##args); }
|
||||
|
||||
#define nm_log_warn(domain, fmt, args...) \
|
||||
{ _nm_log (G_STRFUNC, G_STRLOC, domain, LOGL_WARN, fmt, ##args); }
|
||||
|
||||
#define nm_log_info(domain, fmt, args...) \
|
||||
{ _nm_log (G_STRFUNC, G_STRLOC, domain, LOGL_INFO, fmt, ##args); }
|
||||
|
||||
#define nm_log_dbg(domain, fmt, args...) \
|
||||
{ _nm_log (G_STRFUNC, G_STRLOC, domain, LOGL_DEBUG, fmt, ##args); }
|
||||
|
||||
#define nm_log(domain, level, fmt, args...) \
|
||||
{ _nm_log (G_STRFUNC, G_STRLOC, domain, level, fmt, ##args); }
|
||||
|
||||
void _nm_log (const char *func, const char *loc,
|
||||
guint32 domain, guint32 level,
|
||||
const char *fmt, ...);
|
||||
|
||||
/* Undefine the nm-utils.h logging stuff to ensure errors */
|
||||
#undef nm_print_backtrace
|
||||
#undef nm_get_timestamp
|
||||
#undef nm_info
|
||||
#undef nm_info_str
|
||||
#undef nm_debug
|
||||
#undef nm_debug_str
|
||||
#undef nm_warning
|
||||
#undef nm_warning_str
|
||||
#undef nm_error
|
||||
#undef nm_error_str
|
||||
|
||||
gboolean nm_logging_setup (const char *level, const char *domains, GError **error);
|
||||
void nm_logging_start (gboolean become_daemon);
|
||||
void nm_logging_backtrace (void);
|
||||
void nm_logging_shutdown (void);
|
||||
|
||||
#endif /* NM_LOGGING_H */
|
||||
Reference in New Issue
Block a user