fixed logging
Some checks failed
CI / build (push) Successful in 1m38s
CI / Build Docker images (push) Failing after 21s

This commit is contained in:
2025-01-10 22:13:22 +08:00
parent d2c00402df
commit 608a9d18de
2 changed files with 9 additions and 6 deletions

View File

@@ -94,12 +94,6 @@ class GradleBuildCacheServerCli(application : Application, private val log : Log
} }
val server = GradleBuildCacheServer(configuration) val server = GradleBuildCacheServer(configuration)
server.run().use { server.run().use {
log.info {
"GradleBuildCacheServer is listening on ${configuration.host}:${configuration.port}"
}
}
log.info {
"GradleBuildCacheServer has been gracefully shut down"
} }
} }
} }

View File

@@ -54,6 +54,7 @@ import net.woggioni.gbcs.base.PasswordSecurity.decodePasswordHash
import net.woggioni.gbcs.base.PasswordSecurity.hashPassword import net.woggioni.gbcs.base.PasswordSecurity.hashPassword
import net.woggioni.gbcs.base.Xml import net.woggioni.gbcs.base.Xml
import net.woggioni.gbcs.base.contextLogger import net.woggioni.gbcs.base.contextLogger
import net.woggioni.gbcs.base.info
import net.woggioni.gbcs.configuration.Parser import net.woggioni.gbcs.configuration.Parser
import net.woggioni.gbcs.configuration.Serializer import net.woggioni.gbcs.configuration.Serializer
import net.woggioni.jwo.JWO import net.woggioni.jwo.JWO
@@ -463,6 +464,9 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
it.shutdownGracefully().sync() it.shutdownGracefully().sync()
} }
} }
log.info {
"GradleBuildCacheServer has been gracefully shut down"
}
} }
} }
@@ -493,6 +497,9 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
// Bind and start to accept incoming connections. // Bind and start to accept incoming connections.
val bindAddress = InetSocketAddress(cfg.host, cfg.port) val bindAddress = InetSocketAddress(cfg.host, cfg.port)
val httpChannel = bootstrap.bind(bindAddress).sync() val httpChannel = bootstrap.bind(bindAddress).sync()
log.info {
"GradleBuildCacheServer is listening on ${cfg.host}:${cfg.port}"
}
return ServerHandle(httpChannel, setOf(bossGroup, workerGroup, eventExecutorGroup)) return ServerHandle(httpChannel, setOf(bossGroup, workerGroup, eventExecutorGroup))
} }
@@ -510,5 +517,7 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
fun dumpConfiguration(conf: Configuration, outputStream: OutputStream) { fun dumpConfiguration(conf: Configuration, outputStream: OutputStream) {
Xml.write(Serializer.serialize(conf), outputStream) Xml.write(Serializer.serialize(conf), outputStream)
} }
private val log = contextLogger()
} }
} }