From 608a9d18de0f180218c0802df9824f65e6b59ca4 Mon Sep 17 00:00:00 2001
From: Walter Oggioni <oggioni.walter@gmail.com>
Date: Fri, 10 Jan 2025 22:13:22 +0800
Subject: [PATCH] fixed logging

---
 .../net/woggioni/gbcs/cli/GradleBuildCacheServerCli.kt   | 6 ------
 .../kotlin/net/woggioni/gbcs/GradleBuildCacheServer.kt   | 9 +++++++++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/GradleBuildCacheServerCli.kt b/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/GradleBuildCacheServerCli.kt
index 5e8c932..7b41296 100644
--- a/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/GradleBuildCacheServerCli.kt
+++ b/gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/GradleBuildCacheServerCli.kt
@@ -94,12 +94,6 @@ class GradleBuildCacheServerCli(application : Application, private val log : Log
         }
         val server = GradleBuildCacheServer(configuration)
         server.run().use {
-            log.info {
-                "GradleBuildCacheServer is listening on ${configuration.host}:${configuration.port}"
-            }
-        }
-        log.info {
-            "GradleBuildCacheServer has been gracefully shut down"
         }
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/net/woggioni/gbcs/GradleBuildCacheServer.kt b/src/main/kotlin/net/woggioni/gbcs/GradleBuildCacheServer.kt
index f1c76ae..2d0cef5 100644
--- a/src/main/kotlin/net/woggioni/gbcs/GradleBuildCacheServer.kt
+++ b/src/main/kotlin/net/woggioni/gbcs/GradleBuildCacheServer.kt
@@ -54,6 +54,7 @@ import net.woggioni.gbcs.base.PasswordSecurity.decodePasswordHash
 import net.woggioni.gbcs.base.PasswordSecurity.hashPassword
 import net.woggioni.gbcs.base.Xml
 import net.woggioni.gbcs.base.contextLogger
+import net.woggioni.gbcs.base.info
 import net.woggioni.gbcs.configuration.Parser
 import net.woggioni.gbcs.configuration.Serializer
 import net.woggioni.jwo.JWO
@@ -463,6 +464,9 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
                     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.
         val bindAddress = InetSocketAddress(cfg.host, cfg.port)
         val httpChannel = bootstrap.bind(bindAddress).sync()
+        log.info {
+            "GradleBuildCacheServer is listening on ${cfg.host}:${cfg.port}"
+        }
         return ServerHandle(httpChannel, setOf(bossGroup, workerGroup, eventExecutorGroup))
     }
 
@@ -510,5 +517,7 @@ class GradleBuildCacheServer(private val cfg: Configuration) {
         fun dumpConfiguration(conf: Configuration, outputStream: OutputStream) {
             Xml.write(Serializer.serialize(conf), outputStream)
         }
+
+        private val log = contextLogger()
     }
 }