diff --git a/gradle.properties b/gradle.properties index 603a7591..3eff85e4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -27,4 +27,4 @@ kotlin.stdlib.default.dependency = false # Enable Gradle Configuration Cache -> https://docs.gradle.org/current/userguide/configuration_cache.html # suppress inspection "UnusedProperty" -org.gradle.unsafe.configuration-cache = true +org.gradle.unsafe.configuration-cache = false diff --git a/ij-server/src/main/kotlin/org/jetbrains/research/tasktracker/Application.kt b/ij-server/src/main/kotlin/org/jetbrains/research/tasktracker/Application.kt index 400b6e1a..a0ef39ec 100644 --- a/ij-server/src/main/kotlin/org/jetbrains/research/tasktracker/Application.kt +++ b/ij-server/src/main/kotlin/org/jetbrains/research/tasktracker/Application.kt @@ -7,7 +7,7 @@ import org.jetbrains.research.tasktracker.database.DatabaseFactory import org.jetbrains.research.tasktracker.plugins.configureRouting fun main() { - embeddedServer(Netty, port = 8888, host = "0.0.0.0", module = Application::module) + embeddedServer(Netty, port = 8080, host = "0.0.0.0", module = Application::module) .start(wait = true) } diff --git a/ij-server/src/main/kotlin/org/jetbrains/research/tasktracker/database/DatabaseFactory.kt b/ij-server/src/main/kotlin/org/jetbrains/research/tasktracker/database/DatabaseFactory.kt index 6c936a3f..a3212b99 100644 --- a/ij-server/src/main/kotlin/org/jetbrains/research/tasktracker/database/DatabaseFactory.kt +++ b/ij-server/src/main/kotlin/org/jetbrains/research/tasktracker/database/DatabaseFactory.kt @@ -10,10 +10,10 @@ import org.jetbrains.research.tasktracker.database.models.data.* object DatabaseFactory { fun init() { val database = Database.connect( - url = System.getenv("POSTGRES_URL"), + url = System.getenv("DB_URL"), driver = "org.postgresql.Driver", - user = System.getenv("POSTGRES_USER"), - password = System.getenv("POSTGRES_PASSWORD") + user = System.getenv("DB_USERNAME"), + password = System.getenv("DB_PASSWORD") ) transaction(database) { arrayOf( diff --git a/ij-server/src/main/kotlin/org/jetbrains/research/tasktracker/plugins/Routing.kt b/ij-server/src/main/kotlin/org/jetbrains/research/tasktracker/plugins/Routing.kt index 872ef33a..48fb5d1c 100644 --- a/ij-server/src/main/kotlin/org/jetbrains/research/tasktracker/plugins/Routing.kt +++ b/ij-server/src/main/kotlin/org/jetbrains/research/tasktracker/plugins/Routing.kt @@ -4,6 +4,7 @@ import io.ktor.server.application.* import io.ktor.server.routing.* import org.jetbrains.research.tasktracker.plugins.requests.createResearch import org.jetbrains.research.tasktracker.plugins.requests.createUser +import org.jetbrains.research.tasktracker.plugins.requests.ping import org.jetbrains.research.tasktracker.plugins.requests.uploadLogFile fun Application.configureRouting() { @@ -11,5 +12,6 @@ fun Application.configureRouting() { createUser() createResearch() uploadLogFile() + ping() } } diff --git a/ij-server/src/main/kotlin/org/jetbrains/research/tasktracker/plugins/requests/DefaultRequests.kt b/ij-server/src/main/kotlin/org/jetbrains/research/tasktracker/plugins/requests/DefaultRequests.kt new file mode 100644 index 00000000..48740f04 --- /dev/null +++ b/ij-server/src/main/kotlin/org/jetbrains/research/tasktracker/plugins/requests/DefaultRequests.kt @@ -0,0 +1,14 @@ +package org.jetbrains.research.tasktracker.plugins.requests + +import io.ktor.server.application.* +import io.ktor.server.response.* +import io.ktor.server.routing.* + +/** + * Routing checking that the server is running. + */ +fun Routing.ping() { + get("/healthz") { + call.respondText("OK") + } +}