Use more configurability

diff --git a/src/jvmMain/kotlin/info/mechyrdia/Configuration.kt b/src/jvmMain/kotlin/info/mechyrdia/Configuration.kt
index 2cfe26a8fabde7dfa76964d72a5862acd8d569a5..01ceaedad2f92b6c9edc70d301be73653e1d07f8 100644 (file)
--- a/src/jvmMain/kotlin/info/mechyrdia/Configuration.kt
+++ b/src/jvmMain/kotlin/info/mechyrdia/Configuration.kt
@@ -22,6 +22,8 @@ data class Configuration(
        
        val dbName: String = "nslore",
        val dbConn: String = "mongodb://localhost:27017",
+       
+       val ownerNation: String = "mechyrdia",
 ) {
        companion object {
                val CurrentConfiguration: Configuration by lazy {
@@ -38,5 +40,5 @@ data class Configuration(
        }
 }
 
-const val OWNER_NATION = "mechyrdia"
-val OwnerNationId = Id<NationData>(OWNER_NATION)
+val OwnerNationId: Id<NationData>
+       get() = Id(Configuration.CurrentConfiguration.ownerNation)

diff --git a/src/jvmMain/kotlin/info/mechyrdia/Factbooks.kt b/src/jvmMain/kotlin/info/mechyrdia/Factbooks.kt
index e403143a5f6c9a4641bd295eeb7524f62ddde87a..5455018336d66a9618a2c6c02fbf96170aaa7cf2 100644 (file)
--- a/src/jvmMain/kotlin/info/mechyrdia/Factbooks.kt
+++ b/src/jvmMain/kotlin/info/mechyrdia/Factbooks.kt
@@ -39,7 +39,7 @@ lateinit var application: Application
 fun main() {
        System.setProperty("logback.statusListenerClass", "ch.qos.logback.core.status.NopStatusListener")
        
-       System.setProperty("io.ktor.development", "false")
+       System.setProperty("io.ktor.development", Configuration.CurrentConfiguration.isDevMode.toString())
        
        ConnectionHolder.initialize(Configuration.CurrentConfiguration.dbConn, Configuration.CurrentConfiguration.dbName)