r35157/com_r35157_nenjim-hubd-impl_ref
0
0
Fork 0
Code Issues 18 Pull Requests Actions Packages Projects Releases Wiki Activity

X: NFC - Refactoring and additional logging

Browse Source
This commit is contained in:
minimons
2026-09-04 08:55:58 +02:00
parent 5cda8be951
commit 2b9576d316
1 changed files with 38 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/tjava/com/r35157/nenjim/hubd/impl/ref/NenjimHubImpl.tjava
+38 -26
View File
@@ -76,43 +76,37 @@ public final class NenjimHubImpl implements NenjimHub {
"NenjimHub start has already been attempted"); "NenjimHub start has already been attempted");
} }
Map<NenjimComponentId, ProcessConstructor> processConstructors = Map<NenjimComponentId, ProcessConstructor> processConstructors = createProcessConstructorCatalogue();
createProcessConstructorCatalogue(); Set<NenjimComponentId> knownProcessIds = selectableProcessIds(processConstructors);
NenjimHubConfiguration configuration =
NenjimHubConfigurationParser.parse(
HUB_CONFIGURATION_PATH,
selectableProcessIds(processConstructors),
REGISTRY_SERVICE_ID,
JOURNAL_SERVICE_ID);
log.info("Initializing Nenjim Registry..."); log.debug("Parsing Nenjim configuration...");
NenjimRegistryAssembly registryAssembly = configuration = NenjimHubConfigurationParser.parse(
NenjimRegistryAssembly.create(); HUB_CONFIGURATION_PATH,
registryService = knownProcessIds,
registryAssembly.registryService(); REGISTRY_SERVICE_ID,
JOURNAL_SERVICE_ID
);
log.debug("Initializing Nenjim Registry...");
NenjimRegistryAssembly registryAssembly = NenjimRegistryAssembly.create();
registryService = registryAssembly.registryService();
NenjimProcess registryProcess = registryAssembly.registryProcess(); NenjimProcess registryProcess = registryAssembly.registryProcess();
registryServiceManager = registryAssembly.registryServiceManager(); registryServiceManager = registryAssembly.registryServiceManager();
registryProcess.start(); registryProcess.start();
registryServiceManager.registerComponent( registryServiceManager.registerComponent(
REGISTRY_SERVICE_ID, REGISTRY_SERVICE_ID,
registryService); registryService
);
recordStartedProcess(REGISTRY_SERVICE_ID); recordStartedProcess(REGISTRY_SERVICE_ID);
log.info("Initializing passive Nenjim components..."); log.debug("Initializing passive Nenjim components...");
initializeAndRegisterPassiveComponents(registryServiceManager); initializeAndRegisterPassiveComponents(registryServiceManager);
log.info("Constructing and starting configured Nenjim processes..."); log.info("Auto-starting configured Nenjim processes...");
for (NenjimComponentId componentId autoStartProcesses(processConstructors);
: configuration.autoStartProcessIds().subList(
1,
configuration.autoStartProcessIds().size())) {
constructRegisterAndStartProcess(
componentId,
processConstructors);
}
System.out.println("Done - Now online!"); log.info("Done - Now online!");
waitForAndShutdown(); waitForAndShutdown();
} }
@@ -123,6 +117,20 @@ public final class NenjimHubImpl implements NenjimHub {
return List.copyOf(startedProcessIds); return List.copyOf(startedProcessIds);
} }
private void autoStartProcesses(Map<NenjimComponentId, ProcessConstructor> processConstructors)
throws Exception {
List<NenjimComponentId> autoStartProcessIds = configuration
.autoStartProcessIds()
.subList(1, configuration.autoStartProcessIds().size());
for (NenjimComponentId componentId : autoStartProcessIds) {
constructRegisterAndStartProcess(
componentId,
processConstructors
);
}
}
private NenjimProcess constructJournalProcess() { private NenjimProcess constructJournalProcess() {
JournalServiceAssembly journalAssembly = JournalServiceAssembly journalAssembly =
JournalServiceAssembly.create(JOURNAL_ROOT); JournalServiceAssembly.create(JOURNAL_ROOT);
@@ -416,7 +424,8 @@ public final class NenjimHubImpl implements NenjimHub {
+ "' is not registered as " + "' is not registered as "
+ NenjimProcess.class.getName()); + NenjimProcess.class.getName());
} }
log.info("Auto starting process '" + componentId.value() + "'...");
log.info("Starting process '" + componentId.value() + "'...");
process.start(); process.start();
recordStartedProcess(componentId); recordStartedProcess(componentId);
} }
@@ -534,4 +543,7 @@ public final class NenjimHubImpl implements NenjimHub {
private JavaFxRuntimeService javaFxRuntimeService; private JavaFxRuntimeService javaFxRuntimeService;
private EvelynMissionControl missionControl; private EvelynMissionControl missionControl;
private NenjimProcessManager processManager; private NenjimProcessManager processManager;
// Internal state
private NenjimHubConfiguration configuration;
} }