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

logging: add new combined log domains

Browse Source 
ALL  - for setting all log domains
DHCP - for DHCP4 combined with DHCP6
IP   - for IP4 combined with IP6
This commit is contained in:
Jiří Klimeš
2012-10-31 17:19:38 +01:00
parent 9fa1a9b8ae
commit 8fbd24c9b4
2 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,7 @@
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
* *
* Copyright (C) 2006 - 2010 Red Hat, Inc. * Copyright (C) 2006 - 2012 Red Hat, Inc.
* Copyright (C) 2006 - 2008 Novell, Inc. * Copyright (C) 2006 - 2008 Novell, Inc.
*/ */
@@ -40,13 +40,16 @@
#include "nm-logging.h" #include "nm-logging.h"
#define LOGD_ALL \
(LOGD_HW | LOGD_RFKILL | LOGD_ETHER | LOGD_WIFI | LOGD_BT | LOGD_MB | \
LOGD_DHCP4 | LOGD_DHCP6 | LOGD_PPP | LOGD_WIFI_SCAN | LOGD_IP4 | \
LOGD_IP6 | LOGD_AUTOIP4 | LOGD_DNS | LOGD_VPN | LOGD_SHARING | \
LOGD_SUPPLICANT | LOGD_AGENTS | LOGD_SETTINGS | LOGD_SUSPEND | \
LOGD_CORE | LOGD_DEVICE | LOGD_OLPC_MESH | LOGD_WIMAX | \
LOGD_INFINIBAND | LOGD_FIREWALL | LOGD_ADSL)
static guint32 log_level = LOGL_INFO | LOGL_WARN | LOGL_ERR; static guint32 log_level = LOGL_INFO | LOGL_WARN | LOGL_ERR;
static guint32 log_domains = \ static guint32 log_domains = LOGD_ALL & ~LOGD_WIFI_SCAN;
LOGD_HW | LOGD_RFKILL | LOGD_ETHER | LOGD_WIFI | LOGD_BT | LOGD_MB | \
LOGD_DHCP4 | LOGD_DHCP6 | LOGD_PPP | LOGD_IP4 | LOGD_IP6 | LOGD_AUTOIP4 | \
LOGD_DNS | LOGD_VPN | LOGD_SHARING | LOGD_SUPPLICANT | LOGD_AGENTS | \
LOGD_SETTINGS | LOGD_SUSPEND | LOGD_CORE | LOGD_DEVICE | LOGD_OLPC_MESH | \
LOGD_WIMAX | LOGD_INFINIBAND | LOGD_FIREWALL | LOGD_ADSL;
typedef struct { typedef struct {
guint32 num; guint32 num;
@@ -93,6 +96,11 @@ static const LogDesc domain_descs[] = {
{ 0, NULL } { 0, NULL }
}; };
/* Combined domains */
#define LOGD_ALL_STRING "ALL"
#define LOGD_DHCP_STRING "DHCP"
#define LOGD_IP_STRING "IP"
/************************************************************************/ /************************************************************************/
GQuark GQuark
@@ -151,6 +159,20 @@ nm_logging_setup (const char *level, const char *domains, GError **error)
} }
} }
/* Check for combined domains */
if (!strcasecmp (*iter, LOGD_ALL_STRING)) {
new_domains = LOGD_ALL;
found = TRUE;
} else
if (!strcasecmp (*iter, LOGD_DHCP_STRING)) {
new_domains |= LOGD_DHCP;
found = TRUE;
} else
if (!strcasecmp (*iter, LOGD_IP_STRING)) {
new_domains |= LOGD_IP;
found = TRUE;
}
if (!found) { if (!found) {
g_set_error (error, NM_LOGGING_ERROR, NM_LOGGING_ERROR_UNKNOWN_DOMAIN, g_set_error (error, NM_LOGGING_ERROR, NM_LOGGING_ERROR_UNKNOWN_DOMAIN,
_("Unknown log domain '%s'"), *iter); _("Unknown log domain '%s'"), *iter);

3
src/logging/nm-logging.h
View File

@@ -15,7 +15,7 @@
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
* *
* Copyright (C) 2006 - 2010 Red Hat, Inc. * Copyright (C) 2006 - 2012 Red Hat, Inc.
* Copyright (C) 2006 - 2008 Novell, Inc. * Copyright (C) 2006 - 2008 Novell, Inc.
*/ */
@@ -58,6 +58,7 @@ enum {
}; };
#define LOGD_DHCP (LOGD_DHCP4 | LOGD_DHCP6) #define LOGD_DHCP (LOGD_DHCP4 | LOGD_DHCP6)
#define LOGD_IP (LOGD_IP4 | LOGD_IP6)
/* Log levels */ /* Log levels */
enum { enum {