Fix to embedded mongo. It now properly shuts down the process and del…

…etes files.
lightningkite · Sep 25, 2023 · d984b05 · d984b05
1 parent 4755cc0
commit d984b05
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 16 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,7 +4,7 @@ buildscript {
     val kotlinVersion:String by extra
     val khrysalisVersion: String by extra
     repositories {
-        mavenLocal()
+//        mavenLocal()
         maven(url = "https://s01.oss.sonatype.org/content/repositories/snapshots/")
         maven(url = "https://s01.oss.sonatype.org/content/repositories/releases/")
         google()
@@ -20,7 +20,7 @@ buildscript {
 allprojects {
     group = "com.lightningkite.lightningserver"
     repositories {
-        mavenLocal()
+//        mavenLocal()
         maven(url = "https://s01.oss.sonatype.org/content/repositories/snapshots/")
         maven(url = "https://s01.oss.sonatype.org/content/repositories/releases/")
         mavenCentral()

diff --git a/server-core/build.gradle.kts b/server-core/build.gradle.kts
@@ -34,7 +34,7 @@ dependencies {
     implementation("com.lightningkite.khrysalis:jvm-runtime:$khrysalisVersion")
 
     api("io.ktor:ktor-client-content-negotiation:$ktorVersion")
-    api("io.ktor:ktor-client-cio:$ktorVersion")
+    api("io.ktor:ktor-client-cio-jvm:2.3.4")
 
     implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines")

diff --git a/server-mongo/src/main/kotlin/com/lightningkite/lightningdb/embeddedMongo.kt b/server-mongo/src/main/kotlin/com/lightningkite/lightningdb/embeddedMongo.kt
@@ -69,19 +69,25 @@ private fun embeddedMongo(deleteAfter: Boolean, replFile: File, port: Int): Mong
         }
     }
 
-    val wrapped = MongoClient.create(
+    val client = MongoClient.create(
         MongoClientSettings.builder()
-            .applyConnectionString(ConnectionString("mongodb://localhost:$port/?replicaSet=rs0"))
-            .uuidRepresentation(UuidRepresentation.STANDARD)
-            .build())
-    var closeable: Closeable? = null
-    var fromShutdownHook = false
-    val shutdownHook = Thread {
-        fromShutdownHook = true
-        closeable?.close()
-    }
-    val client = wrapped
-    closeable = client
-    Runtime.getRuntime().addShutdownHook(shutdownHook)
+            .apply {
+
+                applyConnectionString(ConnectionString("mongodb://localhost:$port/?replicaSet=rs0"))
+                uuidRepresentation(UuidRepresentation.STANDARD)
+            }
+            .build()
+    )
+
+
+    Runtime.getRuntime().addShutdownHook(Thread {
+        try {
+            client.close()
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+        mongodExecutable.stop()
+        if (deleteAfter) replFile.deleteRecursively()
+    })
     return client
 }