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

added grpc to get current service configurations, fixed bug for core daemon not using custom service configs

Browse source
This commit is contained in:
Blake Harnden 2019-12-13 18:17:42 -08:00
parent 47cc20b567
commit 85521e8c8f
8 changed files with 112 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

7
daemon/core/services/coreservices.py
View file

@ -461,8 +461,8 @@ class CoreServices:
:param core.netns.vnode.LxcNode node: node to start services on
:return: nothing
"""
funcs = []
boot_paths = ServiceDependencies(node.services).boot_paths()
funcs = []
for boot_path in boot_paths:
args = (node, boot_path)
funcs.append((self._start_boot_paths, args, {}))
@ -484,6 +484,7 @@ class CoreServices:
" -> ".join([x.name for x in boot_path]),
)
for service in boot_path:
service = self.get_service(node.id, service.name, default_service=True)
try:
self.boot_service(node, service)
except Exception:
@ -744,7 +745,9 @@ class CoreServices:
config_files = service.get_configs(node)
for file_name in config_files:
logging.debug("generating service config: %s", file_name)
logging.debug(
"generating service config custom(%s): %s", service.custom, file_name
)
if service.custom:
cfg = service.config_data.get(file_name)
if cfg is None: