added some code to keep track of config services separately within core nodes, added function for starting config services during session instantiation
This commit is contained in:
parent
dbc77d81f6
commit
191a9e9909
8 changed files with 87 additions and 26 deletions
|
@ -8,6 +8,7 @@ from typing import Any, Dict, List
|
|||
|
||||
from mako import exceptions
|
||||
from mako.lookup import TemplateLookup
|
||||
from mako.template import Template
|
||||
|
||||
from core.config import Configuration
|
||||
from core.errors import CoreCommandError, CoreError
|
||||
|
@ -39,6 +40,12 @@ class ConfigService(abc.ABC):
|
|||
configs = self.default_configs[:]
|
||||
self._define_config(configs)
|
||||
|
||||
def __hash__(self) -> int:
|
||||
return hash(self.name)
|
||||
|
||||
def __eq__(self, other: "ConfigService") -> bool:
|
||||
return self.name == other.name
|
||||
|
||||
@property
|
||||
@abc.abstractmethod
|
||||
def name(self) -> str:
|
||||
|
@ -156,27 +163,44 @@ class ConfigService(abc.ABC):
|
|||
f"failed to validate"
|
||||
)
|
||||
|
||||
def render(self, name: str, data: Dict[str, Any] = None) -> None:
|
||||
def _render(
|
||||
self, name: str, template: Template, data: Dict[str, Any] = None
|
||||
) -> None:
|
||||
if data is None:
|
||||
data = {}
|
||||
rendered = template.render_unicode(
|
||||
node=self.node, config=self.render_config(), **data
|
||||
)
|
||||
logging.info(
|
||||
"node(%s) service(%s) template(%s): \n%s",
|
||||
self.node.name,
|
||||
self.name,
|
||||
name,
|
||||
rendered,
|
||||
)
|
||||
self.node.nodefile(name, rendered)
|
||||
|
||||
def render_text(self, name: str, text: str, data: Dict[str, Any] = None) -> None:
|
||||
try:
|
||||
template = self.templates.get_template(name)
|
||||
rendered = template.render_unicode(
|
||||
node=self.node, config=self.render_config(), **data
|
||||
)
|
||||
logging.info(
|
||||
"node(%s) service(%s) template(%s): \n%s",
|
||||
self.node.name,
|
||||
self.name,
|
||||
name,
|
||||
rendered,
|
||||
)
|
||||
self.node.nodefile(name, rendered)
|
||||
text = inspect.cleandoc(text)
|
||||
template = Template(text)
|
||||
self._render(name, template, data)
|
||||
except Exception:
|
||||
raise CoreError(
|
||||
f"node({self.node.name}) service({self.name}) "
|
||||
f"error rendering template({name}): "
|
||||
f"{exceptions.text_error_template().render()}"
|
||||
f"{exceptions.text_error_template().render_unicode()}"
|
||||
)
|
||||
|
||||
def render_template(self, name: str, data: Dict[str, Any] = None) -> None:
|
||||
try:
|
||||
template = self.templates.get_template(name)
|
||||
self._render(name, template, data)
|
||||
except Exception:
|
||||
raise CoreError(
|
||||
f"node({self.node.name}) service({self.name}) "
|
||||
f"error rendering template({name}): "
|
||||
f"{exceptions.text_error_template().render_template()}"
|
||||
)
|
||||
|
||||
def _define_config(self, configs: List[Configuration]) -> None:
|
||||
|
|
|
@ -5,12 +5,20 @@ from typing import List
|
|||
from core import utils
|
||||
from core.configservice.base import ConfigService
|
||||
from core.errors import CoreError
|
||||
from core.nodes.base import CoreNode
|
||||
|
||||
|
||||
class ConfigServiceManager:
|
||||
def __init__(self):
|
||||
self.services = {}
|
||||
|
||||
def set_service(self, node: CoreNode, name: str) -> None:
|
||||
service_class = self.services.get(name)
|
||||
if service_class in node.config_services:
|
||||
raise CoreError(f"node already has service {name}")
|
||||
service = service_class(node)
|
||||
node.config_services.add(service)
|
||||
|
||||
def add(self, service: ConfigService) -> None:
|
||||
name = service.name
|
||||
logging.debug("loading service: class(%s) name(%s)", service.__class__, name)
|
||||
|
@ -34,6 +42,7 @@ class ConfigServiceManager:
|
|||
def load(self, path: str) -> List[str]:
|
||||
path = pathlib.Path(path)
|
||||
subdirs = [x for x in path.iterdir() if x.is_dir()]
|
||||
subdirs.append(path)
|
||||
service_errors = []
|
||||
for subdir in subdirs:
|
||||
logging.info("loading config services from: %s", subdir)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue