LamGC/ScalaBot
1
0
Fork 0
mirror of https://github.com/LamGC/ScalaBot.git synced 2025-04-29 22:27:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(config): 修改 AppConfig 的获取方式, 便于编写测试用例.

Browse Source 
通过 Const 单例对象获取配置信息不利于编写测试用例, 所以改为利用参数的默认值来获取 Const 的 config 对象.

Issue #5
This commit is contained in:
LamGC 2022-05-01 23:54:22 +08:00
parent f11290c73d
commit d24572a4f3
Signed by: LamGC
GPG Key ID: 6C5AE2A913941E1D
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scalabot-app/src/main/kotlin/AppConfigs.kt
View File

@ -106,12 +106,12 @@ internal data class MavenRepositoryConfig(
val authentication: Authentication? = null
) {
fun toRemoteRepository(): RemoteRepository {
fun toRemoteRepository(proxyConfig: ProxyConfig = Const.config.proxy): RemoteRepository {
val builder = RemoteRepository.Builder(null, checkRepositoryLayout(layout), url.toString())
if (proxy != null) {
builder.setProxy(proxy)
} else if (Const.config.proxy.type == DefaultBotOptions.ProxyType.HTTP) {
builder.setProxy(Const.config.proxy.toAetherProxy())
} else if (proxyConfig.type == DefaultBotOptions.ProxyType.HTTP) {
builder.setProxy(proxyConfig.toAetherProxy())
}
return builder.build()
}

33
scalabot-app/src/main/kotlin/AppMain.kt
View File

@ -22,9 +22,7 @@ fun main(args: Array<String>): Unit = runBlocking {
val launcher = Launcher()
.registerShutdownHook()
if (Const.config.metrics.enable) {
startMetricsServer()
}
if (!launcher.launch()) {
exitProcess(1)
}
@ -34,11 +32,16 @@ fun main(args: Array<String>): Unit = runBlocking {
* 启动运行指标服务器.
* 使用 Prometheus 指标格式.
*/
fun startMetricsServer() {
internal fun startMetricsServer(config: MetricsConfig = Const.config.metrics) {
if (!config.enable) {
log.debug { "运行指标服务器已禁用." }
return
}
val builder = HTTPServer.Builder()
.withDaemonThreads(true)
.withPort(Const.config.metrics.port)
.withHostname(Const.config.metrics.bindAddress)
.withPort(config.port)
.withHostname(config.bindAddress)
val httpServer = builder
.build()
@ -46,7 +49,7 @@ fun startMetricsServer() {
log.info { "运行指标服务器已启动. (Port: ${httpServer.port})" }
}
internal class Launcher : AutoCloseable {
internal class Launcher(private val config: AppConfig = Const.config) : AutoCloseable {
companion object {
@JvmStatic
@ -59,9 +62,9 @@ internal class Launcher : AutoCloseable {
private fun getMavenLocalRepository(): LocalRepository {
val localPath =
if (Const.config.mavenLocalRepository != null && Const.config.mavenLocalRepository.isNotEmpty()) {
if (config.mavenLocalRepository != null && config.mavenLocalRepository.isNotEmpty()) {
val repoPath = AppPaths.DATA_ROOT.file.toPath()
.resolve(Const.config.mavenLocalRepository)
.resolve(config.mavenLocalRepository)
.toRealPath()
.toFile()
repoPath
@ -101,15 +104,15 @@ internal class Launcher : AutoCloseable {
val proxyConfig =
if (botConfig.proxy != null && botConfig.proxy.type != DefaultBotOptions.ProxyType.NO_PROXY) {
botConfig.proxy
} else if (Const.config.proxy.type != DefaultBotOptions.ProxyType.NO_PROXY) {
Const.config.proxy
} else if (config.proxy.type != DefaultBotOptions.ProxyType.NO_PROXY) {
config.proxy
} else {
null
}
if (proxyConfig != null) {
proxyType = proxyConfig.type
proxyHost = Const.config.proxy.host
proxyPort = Const.config.proxy.port
proxyHost = config.proxy.host
proxyPort = config.proxy.port
log.debug { "机器人 `${botConfig.account.name}` 已启用代理配置: $proxyConfig" }
}
@ -119,21 +122,21 @@ internal class Launcher : AutoCloseable {
}
val account = botConfig.account
val remoteRepositories = Const.config.mavenRepositories
val remoteRepositories = config.mavenRepositories
.map(MavenRepositoryConfig::toRemoteRepository)
.toMutableList().apply {
if (this.none {
it.url == MavenRepositoryExtensionFinder.MAVEN_CENTRAL_URL
|| it.url == MavenRepositoryExtensionFinder.MAVEN_CENTRAL_URL.trimEnd('/')
}) {
add(MavenRepositoryExtensionFinder.getMavenCentralRepository(proxy = Const.config.proxy.toAetherProxy()))
add(MavenRepositoryExtensionFinder.getMavenCentralRepository(proxy = config.proxy.toAetherProxy()))
}
}.toList()
val extensionPackageFinders = setOf(
MavenRepositoryExtensionFinder(
localRepository = mavenLocalRepository,
remoteRepositories = remoteRepositories,
proxy = Const.config.proxy.toAetherProxy()
proxy = config.proxy.toAetherProxy()
)
)