Do not start server if no config file can be found or read

pklimai · Nov 27, 2024 · 87ed2c0 · 87ed2c0
1 parent d289f64
commit 87ed2c0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/jvmMain/kotlin/Application.kt b/src/jvmMain/kotlin/Application.kt
@@ -17,11 +17,10 @@ import org.postgresql.util.PSQLException
 import java.io.File
 import java.sql.DriverManager
 
+lateinit var config: ConfigFile
 
 fun Application.main() {
 
-    val config = readConfig()
-
     install(DefaultHeaders)
     install(CallLogging)
     install(ContentNegotiation) {
@@ -415,4 +414,7 @@ fun Application.main() {
 }
 
 // See resources/application.conf for ktor configuration
-fun main(args: Array<String>) = io.ktor.server.netty.EngineMain.main(args)
+fun main(args: Array<String>) {
+    config = readConfig() ?: return
+    io.ktor.server.netty.EngineMain.main(args)
+}
diff --git a/src/jvmMain/kotlin/config.kt b/src/jvmMain/kotlin/config.kt
@@ -6,7 +6,7 @@ import java.io.File
 
 const val CONFIG_PATH = "./ems.config.yaml"
 
-fun readConfig(): ConfigFile {
+fun readConfig(): ConfigFile? {
     val mapper = ObjectMapper(YAMLFactory()).also { it.findAndRegisterModules() }
 
     val config: ConfigFile
@@ -17,7 +17,7 @@ fun readConfig(): ConfigFile {
             "Could not read config file from $CONFIG_PATH. \n" +
                     "Make sure the file is there and has proper format (if in Docker, mount as volume)"
         )
-        throw e
+        return null
     }
     println("Done reading config from $CONFIG_PATH")
     return config