|
 |
dddd59 |
commit db98f3b50301027cc822c87ffdc1a75671e9486b
|
|
|
dddd59 |
Author: Thomas Woerner <twoerner@redhat.com>
|
|
|
dddd59 |
Date: Mon Aug 15 12:46:59 2016 +0200
|
|
|
dddd59 |
|
|
|
dddd59 |
firewall.core.logger: Warnings should be printed to stderr per default
|
|
|
dddd59 |
|
|
|
dddd59 |
diff --git a/src/firewall/core/logger.py b/src/firewall/core/logger.py
|
|
|
dddd59 |
index c068e9a..3734762 100644
|
|
|
dddd59 |
--- a/src/firewall/core/logger.py
|
|
|
dddd59 |
+++ b/src/firewall/core/logger.py
|
|
|
dddd59 |
@@ -281,9 +281,10 @@ class Logger(object):
|
|
|
dddd59 |
self.setDebugLogLevel(self.NO_DEBUG)
|
|
|
dddd59 |
self.setFormat("%(label)s%(message)s")
|
|
|
dddd59 |
self.setDateFormat("%d %b %Y %H:%M:%S")
|
|
|
dddd59 |
- self.setInfoLogging("*", self.stderr, [ self.FATAL, self.ERROR ])
|
|
|
dddd59 |
+ self.setInfoLogging("*", self.stderr, [ self.FATAL, self.ERROR,
|
|
|
dddd59 |
+ self.WARNING ])
|
|
|
dddd59 |
self.setInfoLogging("*", self.stdout,
|
|
|
dddd59 |
- [ i for i in range(self.WARNING, self.INFO_MAX+1) ])
|
|
|
dddd59 |
+ [ i for i in range(self.INFO1, self.INFO_MAX+1) ])
|
|
|
dddd59 |
self.setDebugLogging("*", self.stdout,
|
|
|
dddd59 |
[ i for i in range(1, self.DEBUG_MAX+1) ])
|
|
|
dddd59 |
|
|
|
dddd59 |
|
|
|
dddd59 |
commit c51c0ef4dc7e440b0bc2d846f9810aa366699697
|
|
|
dddd59 |
Author: Thomas Woerner <twoerner@redhat.com>
|
|
|
dddd59 |
Date: Mon Aug 15 12:47:53 2016 +0200
|
|
|
dddd59 |
|
|
|
dddd59 |
test-suite: Ignore stderr to get default zone also for missing firewalld.conf
|
|
|
dddd59 |
|
|
|
dddd59 |
With latest changes the message about missing firewalld.conf is printed to
|
|
|
dddd59 |
stderr. This message on stderr needs to be ignored to be able to get the
|
|
|
dddd59 |
fallback default zone setting.
|
|
|
dddd59 |
|
|
|
dddd59 |
diff --git a/src/tests/firewall-cmd_test.sh b/src/tests/firewall-cmd_test.sh
|
|
|
dddd59 |
index 59ea81a..bc06ce0 100755
|
|
|
dddd59 |
--- a/src/tests/firewall-cmd_test.sh
|
|
|
dddd59 |
+++ b/src/tests/firewall-cmd_test.sh
|
|
|
dddd59 |
@@ -170,7 +170,7 @@ assert_bad "--query-panic"
|
|
|
dddd59 |
#assert_good "--lockdown-off"
|
|
|
dddd59 |
#assert_bad "--query-lockdown"
|
|
|
dddd59 |
|
|
|
dddd59 |
-default_zone=$(${path}firewall-cmd --get-default-zone)
|
|
|
dddd59 |
+default_zone=$(${path}firewall-cmd --get-default-zone 2>/dev/null)
|
|
|
dddd59 |
zone="home"
|
|
|
dddd59 |
assert_good_notempty "--get-default-zone"
|
|
|
dddd59 |
assert_good "--set-default-zone=${zone}"
|
|
|
dddd59 |
diff --git a/src/tests/firewall-offline-cmd_test.sh b/src/tests/firewall-offline-cmd_test.sh
|
|
|
dddd59 |
index 00f9a01..ebbdfad 100755
|
|
|
dddd59 |
--- a/src/tests/firewall-offline-cmd_test.sh
|
|
|
dddd59 |
+++ b/src/tests/firewall-offline-cmd_test.sh
|
|
|
dddd59 |
@@ -236,7 +236,7 @@ test_lokkit_opts
|
|
|
dddd59 |
# disable dns again for later tests
|
|
|
dddd59 |
assert_good --remove-service=${service1}
|
|
|
dddd59 |
|
|
|
dddd59 |
-default_zone=$(${path}firewall-offline-cmd --get-default-zone)
|
|
|
dddd59 |
+default_zone=$(${path}firewall-offline-cmd --get-default-zone 2>/dev/null)
|
|
|
dddd59 |
zone="home"
|
|
|
dddd59 |
assert_good_notempty "--get-default-zone"
|
|
|
dddd59 |
assert_good "--set-default-zone=${zone}"
|