Blame SOURCES/0040-fix-propagate-exception-if-backend-fails-with-Indivi.patch
|
 |
c8bceb |
From 1254cf169249fa75ff9838df48402c936e706426 Mon Sep 17 00:00:00 2001
|
|
|
c8bceb |
From: Eric Garver <eric@garver.life>
|
|
|
c8bceb |
Date: Thu, 2 May 2019 11:47:25 -0400
|
|
|
c8bceb |
Subject: [PATCH 40/73] fix: propagate exception if backend fails with
|
|
|
c8bceb |
IndividualCalls=yes
|
|
|
c8bceb |
|
|
|
c8bceb |
They were being logged, but not propagated. They need to be propagated
|
|
|
c8bceb |
so things like reload() can enter FAILED state.
|
|
|
c8bceb |
|
|
|
c8bceb |
(cherry picked from commit 360d40a075f5b72e93d941297cc0badf036e53e3)
|
|
|
c8bceb |
(cherry picked from commit fba166f79f1fac5e94a97c18369f36d13cab1bd6)
|
|
|
c8bceb |
---
|
|
|
c8bceb |
src/firewall/core/fw.py | 3 +--
|
|
|
c8bceb |
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
c8bceb |
|
|
|
c8bceb |
diff --git a/src/firewall/core/fw.py b/src/firewall/core/fw.py
|
|
|
c8bceb |
index 876c43392b1b..114d41090042 100644
|
|
|
c8bceb |
--- a/src/firewall/core/fw.py
|
|
|
c8bceb |
+++ b/src/firewall/core/fw.py
|
|
|
c8bceb |
@@ -882,7 +882,6 @@ class Firewall(object):
|
|
|
c8bceb |
backend.set_rule(rule, self._log_denied)
|
|
|
c8bceb |
except Exception as msg:
|
|
|
c8bceb |
log.debug1(traceback.format_exc())
|
|
|
c8bceb |
- log.error("Failed to apply rules. A firewall reload might solve the issue if the firewall has been modified using ip*tables or ebtables.")
|
|
|
c8bceb |
log.error(msg)
|
|
|
c8bceb |
for rule in reversed(_rules[:i]):
|
|
|
c8bceb |
try:
|
|
|
c8bceb |
@@ -890,7 +889,7 @@ class Firewall(object):
|
|
|
c8bceb |
except Exception:
|
|
|
c8bceb |
# ignore errors here
|
|
|
c8bceb |
pass
|
|
|
c8bceb |
- return False
|
|
|
c8bceb |
+ raise msg
|
|
|
c8bceb |
return True
|
|
|
c8bceb |
else:
|
|
|
c8bceb |
return backend.set_rules(_rules, self._log_denied)
|
|
|
c8bceb |
--
|
|
|
c8bceb |
2.20.1
|
|
|
c8bceb |
|