slhaf/Partner
1
0
Fork 0
mirror of https://github.com/slhaf/Partner.git synced 2026-05-12 08:43:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(config): repair unexpected exiting in method initAll

Browse Source
This commit is contained in:
slhafzjw
2026-04-19 18:51:23 +08:00
parent 7ce7461f79
commit a9e41eb4c7
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/config/ConfigCenter.kt
View File

@@ -1,6 +1,5 @@
package work.slhaf.partner.framework.agent.config package work.slhaf.partner.framework.agent.config
import com.alibaba.fastjson2.JSON
import com.alibaba.fastjson2.JSONObject import com.alibaba.fastjson2.JSONObject
import org.slf4j.LoggerFactory import org.slf4j.LoggerFactory
import work.slhaf.partner.framework.agent.exception.AgentRuntimeException import work.slhaf.partner.framework.agent.exception.AgentRuntimeException
@@ -88,23 +87,40 @@ object ConfigCenter : AutoCloseable {
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
fun initAll() { fun initAll() {
val errorConfig = mutableMapOf<Path, String>()
registrations.forEach { (path, registration) -> registrations.forEach { (path, registration) ->
val pair = loadConfig(path, registration) val pair = loadConfig(path, registration)
if (pair != null) { if (pair != null) {
(registration as ConfigRegistration<Config>).init(pair.first, pair.second) (registration as ConfigRegistration<Config>).init(pair.first, pair.second)
return return@forEach
} }
val defaultConfig = registration.defaultConfig() val defaultConfig = registration.defaultConfig()
if (defaultConfig != null) { if (defaultConfig != null) {
(registration as ConfigRegistration<Config>).init(defaultConfig, null) (registration as ConfigRegistration<Config>).init(defaultConfig, null)
return@forEach
} }
val configDoc = resolveConfigDoc(registration.type()) val configDoc = resolveConfigDoc(registration.type())
errorConfig[path] = configDoc
}
if (errorConfig.isNotEmpty()) {
throw AgentStartupException( throw AgentStartupException(
"Failed to init config, related path: $path, config definition: $configDoc", "Failed to init configurations: ${buildErrorConfigReport(errorConfig)}",
COMPONENT_NAME COMPONENT_NAME
) )
} }
}
private fun buildErrorConfigReport(errorConfig: MutableMap<Path, String>): String {
return buildString {
appendLine()
append("\n=====Config Missing=====\n")
errorConfig.forEach { (path, config) ->
appendLine("\n>>>\t$path\t>>>\n")
append(config)
appendLine()
appendLine("\n<<<\t$path\t<<<")
}
}
} }
private fun resolveConfigDoc(type: Class<out Config>): String { private fun resolveConfigDoc(type: Class<out Config>): String {
@@ -205,10 +221,11 @@ object ConfigCenter : AutoCloseable {
private fun loadConfig(file: Path, registration: ConfigRegistration<out Config>): Pair<Config, JSONObject>? { private fun loadConfig(file: Path, registration: ConfigRegistration<out Config>): Pair<Config, JSONObject>? {
return try { return try {
val json = JSON.parseObject(Files.readString(file, StandardCharsets.UTF_8)) val json = JSONObject.parseObject(Files.readString(file, StandardCharsets.UTF_8))
val config = json.toJavaObject(registration.type()) val config = json.toJavaObject(registration.type())
config to json config to json
} catch (_: Exception) { } catch (_: Exception) {
log.warn("Unable to load config from ${file.toAbsolutePath()}")
null null
} }
} }
@@ -243,7 +260,7 @@ object ConfigCenter : AutoCloseable {
checkAgentStartup(!path.isAbsolute) { checkAgentStartup(!path.isAbsolute) {
AgentStartupException("Config path must be relative: $path", COMPONENT_NAME) AgentStartupException("Config path must be relative: $path", COMPONENT_NAME)
} }
return path.normalize() return paths.configDir.resolve(path).normalize()
} }
} }