afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixed config service to leverage validation_timer properly, added unit tests for config service base class

Browse source
This commit is contained in:
Blake Harnden 2020-01-27 10:57:16 -08:00
parent 80073dd8c8
commit 09aa882017
2 changed files with 310 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
daemon/core/configservice/base.py
View file

@ -140,7 +140,7 @@ class ConfigService(abc.ABC):
self.run_startup(wait)
if not wait:
if self.validation_mode == ConfigServiceMode.TIMER:
time.sleep(self.validation_timer)
self.wait_validation()
else:
self.run_validation()
@ -275,6 +275,14 @@ class ConfigService(abc.ABC):
f"node({self.node.name}) service({self.name}) failed startup: {e}"
)
def wait_validation(self) -> None:
"""
Waits for a period of time to consider service started successfully.
:return: nothing
"""
time.sleep(self.validation_timer)
def run_validation(self) -> None:
"""
Runs validation commands for service on node.
@ -298,7 +306,7 @@ class ConfigService(abc.ABC):
)
time.sleep(self.validation_period)
if cmds and time.monotonic() - start > 0:
if cmds and time.monotonic() - start > self.validation_timer:
raise ConfigServiceBootError(
f"node({self.node.name}) service({self.name}) failed to validate"
)