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

daemon: updated how local services are loaded to leverage full core path imports, avoiding name collisions with external modules

Browse source
This commit is contained in:
Blake Harnden 2022-03-02 12:42:53 -08:00
parent a42697ecce
commit 2eef7076f4
3 changed files with 23 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

3
daemon/core/emulator/coreemu.py
View file

@ -6,7 +6,6 @@ import sys
from pathlib import Path
from typing import Dict, List, Type
import core.services
from core import utils
from core.configservice.manager import ConfigServiceManager
from core.emane.modelmanager import EmaneModelManager
@ -92,7 +91,7 @@ class CoreEmu:
:return: nothing
"""
# load default services
self.service_errors = core.services.load()
self.service_errors = ServiceManager.load_locals()
# load custom services
service_paths = self.config.get("custom_services_dir")
logger.debug("custom service paths: %s", service_paths)