Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/main/kotlin/com/example/Application.kt
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,16 @@ import com.example.config.configureRouting
import com.example.config.configureSecurity
import com.example.config.configureSerialization
import com.example.config.configureSession
import com.example.shared.applicationEnv
import io.ktor.server.application.*

fun main(args: Array<String>) {
io.ktor.server.netty.EngineMain.main(args)
}

fun Application.module() {
this.log.info("current env: ${applicationEnv()}")

configureDatabase()
configureDependencyInjection()
configureHttp()
Expand Down
12 changes: 8 additions & 4 deletions src/main/kotlin/com/example/config/Database.kt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import com.example.domain.model.CafeOrder
import com.example.shared.CafeOrderStatus
import com.example.shared.dummyMenuQueryList
import com.example.shared.dummyUserQueryList
import com.example.shared.getPropertyBoolean
import com.example.shared.getPropertyString
import com.zaxxer.hikari.HikariConfig
import com.zaxxer.hikari.HikariDataSource
import io.ktor.server.application.*
Expand All @@ -27,7 +29,9 @@ import kotlin.random.Random
fun Application.configureDatabase() {
configureH2()
connectDatabase()
initData()
if (getPropertyBoolean("db.initData", false)) {
initData()
}
}


Expand All @@ -45,11 +49,11 @@ fun Application.configureH2() {
}


private fun connectDatabase() {
private fun Application.connectDatabase() {
val config =
HikariConfig().apply {
jdbcUrl = "jdbc:h2:mem:cafedb"
driverClassName = "org.h2.Driver"
jdbcUrl = getPropertyString("db.jdbcUrl")
driverClassName = getPropertyString("db.driverClassName")
validate()
}

Expand Down
10 changes: 10 additions & 0 deletions src/main/resources/application-local.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
ktor {
development = true
environment = "local"
}

db {
jdbcUrl = "jdbc:h2:mem:cafedb"
driverClassName = "org.h2.Driver"
initData = true
}
10 changes: 10 additions & 0 deletions src/main/resources/application-prod.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
ktor {
development = true
environment = "prod"
}

db {
jdbcUrl = "jdbc:h2:mem:cafedb"
driverClassName = "org.h2.Driver"
initData = false
}