Merge remote-tracking branch 'origin/develop' into develop

Author: dayyeeet

controller-runtime/src/main/kotlin/app/simplecloud/controller/runtime/ControllerRuntime.kt

@@ -19,7 +19,6 @@ import io.grpc.Server
 import io.grpc.ServerBuilder
 import kotlinx.coroutines.*
 import org.apache.logging.log4j.LogManager
-import kotlin.concurrent.thread
 
 class ControllerRuntime(
     private val controllerStartCommand: ControllerStartCommand
@@ -45,13 +44,23 @@ class ControllerRuntime(
     private val server = createGrpcServer()
     private val pubSubServer = createPubSubGrpcServer()
 
-    fun start() {
+    suspend fun start() {
         setupDatabase()
         startPubSubGrpcServer()
         startGrpcServer()
         startReconciler()
         loadGroups()
         loadServers()
+
+        suspendCancellableCoroutine<Unit> { continuation ->
+            Runtime.getRuntime().addShutdownHook(Thread {
+                server.shutdown()
+                continuation.resume(Unit) { cause, _, _ ->
+                    logger.info("Server shutdown due to: $cause")
+                }
+            })
+        }
+
     }
 
     private fun setupDatabase() {
@@ -71,17 +80,27 @@ class ControllerRuntime(
 
     private fun startGrpcServer() {
         logger.info("Starting gRPC server...")
-        thread {
-            server.start()
-            server.awaitTermination()
+        CoroutineScope(Dispatchers.Default).launch {
+            try {
+                server.start()
+                server.awaitTermination()
+            } catch (e: Exception) {
+                logger.error("Error in gRPC server", e)
+                throw e
+            }
         }
     }
 
     private fun startPubSubGrpcServer() {
         logger.info("Starting pubsub gRPC server...")
-        thread {
-            pubSubServer.start()
-            pubSubServer.awaitTermination()
+        CoroutineScope(Dispatchers.Default).launch {
+            try {
+                pubSubServer.start()
+                pubSubServer.awaitTermination()
+            } catch (e: Exception) {
+                logger.error("Error in gRPC server", e)
+                throw e
+            }
         }
     }
 

controller-runtime/src/main/kotlin/app/simplecloud/controller/runtime/launcher/ControllerStartCommand.kt

@@ -3,7 +3,7 @@ package app.simplecloud.controller.runtime.launcher
 import app.simplecloud.controller.runtime.ControllerRuntime
 import app.simplecloud.controller.shared.secret.AuthFileSecretFactory
 import app.simplecloud.metrics.internal.api.MetricsCollector
-import com.github.ajalt.clikt.core.CliktCommand
+import com.github.ajalt.clikt.command.SuspendingCliktCommand
 import com.github.ajalt.clikt.core.context
 import com.github.ajalt.clikt.parameters.options.default
 import com.github.ajalt.clikt.parameters.options.defaultLazy
@@ -18,7 +18,7 @@ import java.nio.file.Path
 
 class ControllerStartCommand(
     private val metricsCollector: MetricsCollector?
-)  : CliktCommand() {
+) : SuspendingCliktCommand() {
 
     init {
         context {
@@ -54,7 +54,7 @@ class ControllerStartCommand(
         .boolean()
         .default(true)
 
-    override fun run() {
+    override suspend fun run() {
         if (trackMetrics) {
             metricsCollector?.start()
         }

controller-runtime/src/main/kotlin/app/simplecloud/controller/runtime/launcher/Launcher.kt

@@ -1,6 +1,7 @@
 package app.simplecloud.controller.runtime.launcher
 
 import app.simplecloud.metrics.internal.api.MetricsCollector
+import com.github.ajalt.clikt.command.main
 import org.apache.logging.log4j.LogManager
 
 

gradle/libs.versions.toml

@@ -2,7 +2,8 @@
 kotlin = "2.0.20"
 kotlinCoroutines = "1.9.0"
 shadow = "8.3.3"
-log4j = "2.20.0"
+log4j = "2.22.0"
+slf4j = "2.0.16"
 protobuf = "3.25.2"
 grpc = "1.61.0"
 grpcKotlin = "1.4.1"
@@ -12,7 +13,7 @@ simplecloud-metrics = "1.0.0"
 jooq = "3.19.3"
 configurate = "4.1.2"
 sqliteJdbc = "3.44.1.0"
-clikt = "4.3.0"
+clikt = "5.0.1"
 sonatypeCentralPortalPublisher = "1.2.3"
 spotifyCompletableFutures = "0.3.6"
 
@@ -24,6 +25,7 @@ kotlinCoroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", v
 log4jCore = { module = "org.apache.logging.log4j:log4j-core", version.ref = "log4j" }
 log4jApi = { module = "org.apache.logging.log4j:log4j-api", version.ref = "log4j" }
 log4jSlf4j = { module = "org.apache.logging.log4j:log4j-slf4j-impl", version.ref = "log4j" }
+slf4jApi = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }  # Add this
 
 protobufKotlin = { module = "com.google.protobuf:protobuf-kotlin", version.ref = "protobuf" }
 
@@ -54,7 +56,8 @@ spotifyCompletableFutures = { module = "com.spotify:completable-futures", versio
 log4j = [
     "log4jCore",
     "log4jApi",
-    "log4jSlf4j"
+    "log4jSlf4j",
+    "slf4jApi"
 ]
 proto = [
     "protobufKotlin",