Skip to content
Merged
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
1 change: 1 addition & 0 deletions Procfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
web: server/target/universal/stage/bin/evaluator-server -Dhttp.port=$PORT
2 changes: 2 additions & 0 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
lazy val root = (project in file("."))
.settings(mainClass in Universal := Some("org.scalaexercises.evaluator.EvaluatorServer"))
.settings(stage <<= (stage in Universal in `evaluator-server`))
.aggregate(`evaluator-server`, `evaluator-shared`, `evaluator-client`)

lazy val `evaluator-shared` = (project in file("shared"))
Expand Down
13 changes: 12 additions & 1 deletion server/src/main/resources/application.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
http {
host = "0.0.0.0"
host = ${?HOST}
port = 8080
port = ${?PORT}
}

eval.auth {
secretKey = "secretKey"
secretKey = ${?EVAL_SECRET_KEY}
}
}

# Loader IO Configuration
loaderio.verificationToken=loaderio-changeme
loaderio.verificationToken=${?LOADERIO_VERIFICATION_TOKEN}
14 changes: 12 additions & 2 deletions server/src/main/scala/org/scalaexercises/evaluator/services.scala
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,15 @@ object services {
}
})

def loaderIOService = HttpService {

case _ -> Root =>
MethodNotAllowed()

case GET -> Root / "loaderio-1318d1b3e06b7bc96dd5de5716f57496" =>
Ok("loaderio-1318d1b3e06b7bc96dd5de5716f57496")
}

}

object EvaluatorServer extends App {
Expand All @@ -76,16 +85,17 @@ object EvaluatorServer extends App {

private[this] val logger = getLogger

val ip = Option(System.getenv("EVALUATOR_SERVER_IP")).getOrElse("0.0.0.0")
val ip = Option(System.getenv("HOST")).getOrElse("0.0.0.0")

val port = (Option(System.getenv("EVALUATOR_SERVER_PORT")) orElse
val port = (Option(System.getenv("PORT")) orElse
Option(System.getProperty("http.port"))).map(_.toInt).getOrElse(8080)

logger.info(s"Initializing Evaluator at $ip:$port")

BlazeBuilder
.bindHttp(port, ip)
.mountService(evalService)
.mountService(loaderIOService)
.start
.run
.awaitShutdown()
Expand Down