External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-08 22:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: eliminate erroneous VIR_WARNs in (eb|ip)tables.c

Browse Source 
Several VIR_DEBUG()'s were changed to VIR_WARN() while I was testing
the firewalld support patch, and I neglected to change them back
before I pushed.

In the meantime I've decided that it would be useful to have them be
VIR_INFO(), just so there will be logged evidence of which method is
being used (firewall-cmd vs. (eb|ip)tables) without needing to crank
logging to 11. (at most this adds 2 lines to libvirtd's logs per
libvirtd start).
This commit is contained in:
Laine Stump 2012-08-22 16:00:28 -04:00
parent 66d811293a
commit 947a51ee94
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/util/ebtables.c
View File

@ -55,7 +55,7 @@ virEbTablesOnceInit(void)
{
firewall_cmd_path = virFindFileInPath("firewall-cmd");
if (!firewall_cmd_path) {
VIR_WARN("firewall-cmd not found on system. "
VIR_INFO("firewall-cmd not found on system. "
"firewalld support disabled for ebtables.");
} else {
virCommandPtr cmd = virCommandNew(firewall_cmd_path);
@ -63,11 +63,11 @@ virEbTablesOnceInit(void)
virCommandAddArgList(cmd, "--state", NULL);
if (virCommandRun(cmd, &status) < 0 || status != 0) {
VIR_WARN("firewall-cmd found but disabled for ebtables");
VIR_INFO("firewall-cmd found but disabled for ebtables");
VIR_FREE(firewall_cmd_path);
firewall_cmd_path = NULL;
} else {
VIR_WARN("using firewalld for ebtables commands");
VIR_INFO("using firewalld for ebtables commands");
}
virCommandFree(cmd);
}

6
src/util/iptables.c
View File

@ -53,7 +53,7 @@ virIpTablesOnceInit(void)
{
firewall_cmd_path = virFindFileInPath("firewall-cmd");
if (!firewall_cmd_path) {
VIR_WARN("firewall-cmd not found on system. "
VIR_INFO("firewall-cmd not found on system. "
"firewalld support disabled for iptables.");
} else {
virCommandPtr cmd = virCommandNew(firewall_cmd_path);
@ -61,11 +61,11 @@ virIpTablesOnceInit(void)
virCommandAddArgList(cmd, "--state", NULL);
if (virCommandRun(cmd, &status) < 0 || status != 0) {
VIR_WARN("firewall-cmd found but disabled for iptables");
VIR_INFO("firewall-cmd found but disabled for iptables");
VIR_FREE(firewall_cmd_path);
firewall_cmd_path = NULL;
} else {
VIR_WARN("using firewalld for iptables commands");
VIR_INFO("using firewalld for iptables commands");
}
virCommandFree(cmd);
}