From afa50e9d39d7e2599719c411f523d9205c33ad3b Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Thu, 9 Dec 2021 22:38:45 +0100
Subject: Revert "vrrp: T4059: do "late" read of the CLI configuration as this
fails in __init__"
This reverts commit bcfe967f607a83192d75c01e7f414655891eec60.
---
src/system/keepalived-fifo.py | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/src/system/keepalived-fifo.py b/src/system/keepalived-fifo.py
index cde0c6cc5..b1fe7e43f 100755
--- a/src/system/keepalived-fifo.py
+++ b/src/system/keepalived-fifo.py
@@ -53,7 +53,7 @@ class KeepalivedFifo:
# parse arguments
cmd_args = cmd_args_parser.parse_args()
- self.vrrp_config_dict = None
+ self._config_load()
self.pipe_path = cmd_args.PIPE
# create queue for messages and events for syncronization
@@ -97,11 +97,6 @@ class KeepalivedFifo:
logger.debug('Message processing start')
regex_notify = re.compile(r'^(?P<type>\w+) "(?P<name>[\w-]+)" (?P<state>\w+) (?P<priority>\d+)$', re.MULTILINE)
while self.stopme.is_set() is False:
- # XXX: T4059 - do a "late" read of the CLI configuration as this would fail in __init__.
- # Thus we simply read the configuration the first time it really becomes necessary
- # and a message requireing the data needs it actually.
- if self.vrrp_config_dict == None:
- self._config_load()
# wait for a new message event from pipe_wait
self.message_event.wait()
try:
--
cgit v1.2.3