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

logging: add DCB log domain

Browse Source
This commit is contained in:
Dan Williams
2013-10-03 21:38:59 -05:00
parent a3bd6df05f
commit 3e6906e773
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
man/NetworkManager.conf.xml
View File

@@ -286,7 +286,8 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth
HW, RFKILL, ETHER, WIFI, BT, MB, DHCP4, DHCP6, PPP, HW, RFKILL, ETHER, WIFI, BT, MB, DHCP4, DHCP6, PPP,
WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT, WIFI_SCAN, IP4, IP6, AUTOIP4, DNS, VPN, SHARING, SUPPLICANT,
AGENTS, SETTINGS, SUSPEND, CORE, DEVICE, OLPC, WIMAX, AGENTS, SETTINGS, SUSPEND, CORE, DEVICE, OLPC, WIMAX,
INFINIBAND, FIREWALL, ADSL, BOND, VLAN, BRIDGE.</para> INFINIBAND, FIREWALL, ADSL, BOND, VLAN, BRIDGE, DBUS_PROPS,
TEAM, CONCHECK, DCB.</para>
<para>In addition, these special domains can be used: NONE, <para>In addition, these special domains can be used: NONE,
ALL, DEFAULT, DHCP, IP.</para></listitem> ALL, DEFAULT, DHCP, IP.</para></listitem>
</varlistentry> </varlistentry>

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

@@ -49,7 +49,8 @@ nm_log_handler (const gchar *log_domain,
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_BOND | \ LOGD_INFINIBAND | LOGD_FIREWALL | LOGD_ADSL | LOGD_BOND | \
LOGD_VLAN | LOGD_BRIDGE | LOGD_DBUS_PROPS | LOGD_TEAM | LOGD_CONCHECK) LOGD_VLAN | LOGD_BRIDGE | LOGD_DBUS_PROPS | LOGD_TEAM | LOGD_CONCHECK | \
LOGD_DCB)
#define LOGD_DEFAULT (LOGD_ALL & ~(LOGD_WIFI_SCAN | LOGD_DBUS_PROPS)) #define LOGD_DEFAULT (LOGD_ALL & ~(LOGD_WIFI_SCAN | LOGD_DBUS_PROPS))
@@ -105,6 +106,7 @@ static const LogDesc domain_descs[] = {
{ LOGD_DBUS_PROPS,"DBUS_PROPS" }, { LOGD_DBUS_PROPS,"DBUS_PROPS" },
{ LOGD_TEAM, "TEAM" }, { LOGD_TEAM, "TEAM" },
{ LOGD_CONCHECK, "CONCHECK" }, { LOGD_CONCHECK, "CONCHECK" },
{ LOGD_DCB, "DCB" },
{ 0, NULL } { 0, NULL }
}; };

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

@@ -61,6 +61,7 @@ enum {
LOGD_DBUS_PROPS = (1LL << 31), LOGD_DBUS_PROPS = (1LL << 31),
LOGD_TEAM = (1LL << 32), LOGD_TEAM = (1LL << 32),
LOGD_CONCHECK = (1LL << 33), LOGD_CONCHECK = (1LL << 33),
LOGD_DCB = (1LL << 34), /* Data Center Bridging */
}; };
#define LOGD_DHCP (LOGD_DHCP4 | LOGD_DHCP6) #define LOGD_DHCP (LOGD_DHCP4 | LOGD_DHCP6)