Allow termination of Ktor clients and Logger

cyb3rko · May 3, 2022 · 9fbf6a1 · 9fbf6a1
1 parent 9916ef9
commit 9fbf6a1
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/src/main/kotlin/com/cyb3rko/m3okotlin/Log.kt b/src/main/kotlin/com/cyb3rko/m3okotlin/Log.kt
@@ -3,13 +3,17 @@ package com.cyb3rko.m3okotlin
 import java.util.logging.Logger
 
 internal object Log {
-    private lateinit var log: Logger
+    private var log: Logger? = null
 
     internal fun initialize() {
         log = Logger.getLogger(M3O::class.java.name)
     }
 
-    internal fun i(message: String) = log.info(message)
+    internal fun terminate() {
+        log = null
+    }
+
+    internal fun i(message: String) = log?.info(message)
 
-    internal fun e(message: String) = log.severe(message)
+    internal fun e(message: String) = log?.severe(message)
 }
diff --git a/src/main/kotlin/com/cyb3rko/m3okotlin/M3O.kt b/src/main/kotlin/com/cyb3rko/m3okotlin/M3O.kt
@@ -56,6 +56,18 @@ object M3O {
         Log.i("Ktor M3O Client initialized.")
     }
 
+    fun terminate() {
+        if (::ktorHttpClient.isInitialized) {
+            ktorHttpClient.close()
+        }
+        if (::ktorHttpMultipartClient.isInitialized) {
+            ktorHttpMultipartClient.close()
+        }
+
+        Log.i("Ktor M3O Client terminated.")
+        Log.terminate()
+    }
+
     internal fun getKtorHttpMultipartClient(): HttpClient {
         if (!::ktorHttpMultipartClient.isInitialized) {
             ktorHttpMultipartClient = HttpClient {