diff options
| author | Christian Poessinger <christian@poessinger.com> | 2021-12-09 21:58:47 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2021-12-09 22:16:44 +0100 |
| commit | 977dbf6b9452a81e7f04789182f852afe5f3a0bd (patch) | |
| tree | 9f23e8feb64df6435db10e285bab3b9c9ec2f138 | |
| parent | d24888fb933e68ce1ccbf704429c602a02a44638 (diff) | |
| download | vyos-1x-977dbf6b9452a81e7f04789182f852afe5f3a0bd.tar.gz vyos-1x-977dbf6b9452a81e7f04789182f852afe5f3a0bd.zip | |
Revert "vrrp: T4059: do "late" read of the CLI configuration as this fails in __init__"
This reverts commit f168e409acb314d1c15a4343643be7c07ce79b44.
| -rwxr-xr-x | src/system/keepalived-fifo.py | 7 |
1 files changed, 1 insertions, 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: |