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

logging: add "BOND" log domain

Browse Source
This commit is contained in:
Jiří Klimeš
2012-10-31 17:31:38 +01:00
parent 8fbd24c9b4
commit 8437b07581
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,7 +46,7 @@
LOGD_IP6 | LOGD_AUTOIP4 | LOGD_DNS | LOGD_VPN | LOGD_SHARING | \ LOGD_IP6 | LOGD_AUTOIP4 | LOGD_DNS | LOGD_VPN | LOGD_SHARING | \
LOGD_SUPPLICANT | LOGD_AGENTS | LOGD_SETTINGS | LOGD_SUSPEND | \ LOGD_SUPPLICANT | LOGD_AGENTS | LOGD_SETTINGS | LOGD_SUSPEND | \
LOGD_CORE | LOGD_DEVICE | LOGD_OLPC_MESH | LOGD_WIMAX | \ LOGD_CORE | LOGD_DEVICE | LOGD_OLPC_MESH | LOGD_WIMAX | \
LOGD_INFINIBAND | LOGD_FIREWALL | LOGD_ADSL) LOGD_INFINIBAND | LOGD_FIREWALL | LOGD_ADSL | LOGD_BOND)
static guint32 log_level = LOGL_INFO | LOGL_WARN | LOGL_ERR; static guint32 log_level = LOGL_INFO | LOGL_WARN | LOGL_ERR;
static guint32 log_domains = LOGD_ALL & ~LOGD_WIFI_SCAN; static guint32 log_domains = LOGD_ALL & ~LOGD_WIFI_SCAN;
@@ -93,6 +93,7 @@ static const LogDesc domain_descs[] = {
{ LOGD_INFINIBAND,"INFINIBAND" }, { LOGD_INFINIBAND,"INFINIBAND" },
{ LOGD_FIREWALL, "FIREWALL" }, { LOGD_FIREWALL, "FIREWALL" },
{ LOGD_ADSL, "ADSL" }, { LOGD_ADSL, "ADSL" },
{ LOGD_BOND, "BOND" },
{ 0, NULL } { 0, NULL }
}; };

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

@@ -55,6 +55,7 @@ enum {
LOGD_INFINIBAND = 0x01000000, LOGD_INFINIBAND = 0x01000000,
LOGD_FIREWALL = 0x02000000, LOGD_FIREWALL = 0x02000000,
LOGD_ADSL = 0x04000000, LOGD_ADSL = 0x04000000,
LOGD_BOND = 0x08000000,
}; };
#define LOGD_DHCP (LOGD_DHCP4 | LOGD_DHCP6) #define LOGD_DHCP (LOGD_DHCP4 | LOGD_DHCP6)

8
src/nm-device-bond.c
View File

@@ -330,7 +330,7 @@ slave_state_changed (NMDevice *slave,
{ {
NMDeviceBond *self = NM_DEVICE_BOND (user_data); NMDeviceBond *self = NM_DEVICE_BOND (user_data);
nm_log_dbg (LOGD_DEVICE, "(%s): slave %s state change %d -> %d", nm_log_dbg (LOGD_BOND, "(%s): slave %s state change %d -> %d",
nm_device_get_iface (NM_DEVICE (self)), nm_device_get_iface (NM_DEVICE (self)),
nm_device_get_iface (slave), nm_device_get_iface (slave),
old_state, old_state,
@@ -400,7 +400,7 @@ enslave_slave (NMDevice *device, NMDevice *slave)
self); self);
priv->slaves = g_slist_append (priv->slaves, sinfo); priv->slaves = g_slist_append (priv->slaves, sinfo);
nm_log_dbg (LOGD_DEVICE, "(%s): enslaved bond slave %s", nm_log_dbg (LOGD_BOND, "(%s): enslaved bond slave %s",
nm_device_get_ip_iface (device), nm_device_get_ip_iface (device),
nm_device_get_ip_iface (slave)); nm_device_get_ip_iface (slave));
g_object_notify (G_OBJECT (device), "slaves"); g_object_notify (G_OBJECT (device), "slaves");
@@ -427,7 +427,7 @@ release_slave (NMDevice *device, NMDevice *slave)
nm_device_get_ip_iface (device), nm_device_get_ip_iface (device),
nm_device_get_ip_ifindex (slave), nm_device_get_ip_ifindex (slave),
nm_device_get_ip_iface (slave)); nm_device_get_ip_iface (slave));
nm_log_dbg (LOGD_DEVICE, "(%s): released bond slave %s (success %d)", nm_log_dbg (LOGD_BOND, "(%s): released bond slave %s (success %d)",
nm_device_get_ip_iface (device), nm_device_get_ip_iface (device),
nm_device_get_ip_iface (slave), nm_device_get_ip_iface (slave),
success); success);
@@ -459,7 +459,7 @@ constructed (GObject *object)
{ {
G_OBJECT_CLASS (nm_device_bond_parent_class)->constructed (object); G_OBJECT_CLASS (nm_device_bond_parent_class)->constructed (object);
nm_log_dbg (LOGD_HW | LOGD_DEVICE, "(%s): kernel ifindex %d", nm_log_dbg (LOGD_HW | LOGD_BOND, "(%s): kernel ifindex %d",
nm_device_get_iface (NM_DEVICE (object)), nm_device_get_iface (NM_DEVICE (object)),
nm_device_get_ifindex (NM_DEVICE (object))); nm_device_get_ifindex (NM_DEVICE (object)));
} }