From 812710a605677d9d781246781f1d0f804ce3e488 Mon Sep 17 00:00:00 2001
From: kraken <root@sunsongs.ru>
Date: Wed, 29 Jun 2016 10:46:39 +0500
Subject: [PATCH] Factor out configuration for redis and http server

---
 src/main/resources/application.conf     | 11 +++++++++++
 src/main/scala/com/example/Server.scala | 18 +++++++++++++++---
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf
index 5a9c3f4..6f05dcf 100644
--- a/src/main/resources/application.conf
+++ b/src/main/resources/application.conf
@@ -7,4 +7,15 @@ akka {
       }
     }
   }
+}
+
+redis {
+  host = "localhost"
+  port = 6379
+# password = "123"
+}
+
+http {
+  interface = "0.0.0.0"
+  port = 8888
 }
\ No newline at end of file
diff --git a/src/main/scala/com/example/Server.scala b/src/main/scala/com/example/Server.scala
index ba963f0..3ee092c 100644
--- a/src/main/scala/com/example/Server.scala
+++ b/src/main/scala/com/example/Server.scala
@@ -7,19 +7,31 @@ import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.server.Route
 import akka.stream.ActorMaterializer
 import akka.util.ByteString
+import com.typesafe.config.ConfigFactory
 import redis.RedisClient
 
 import scala.concurrent.Future
 import scala.io.StdIn
 
 object Server {
+  private val config =  ConfigFactory.load()
+
+  private val redisConfig = config.getConfig("redis")
+  private val redisHost = redisConfig.getString("host")
+  private val redisPort = redisConfig.getInt("port")
+  private val redisPassword = if (redisConfig.hasPath("password")) Some(redisConfig.getString("password")) else None
+
+  private val httpConfig = config.getConfig("http")
+  private val interface = httpConfig.getString("interface")
+  private val port = httpConfig.getInt("port")
+
   def main(args: Array[String]) {
     implicit val system = ActorSystem("my-system")
     implicit val materializer = ActorMaterializer()
     // needed for the future flatMap/onComplete in the end
     implicit val executionContext = system.dispatcher
 
-    val redis = RedisClient()
+    val redis = RedisClient(redisHost, redisPort, redisPassword)
 
     val route: Route =
       get {
@@ -34,9 +46,9 @@ object Server {
         }
       }
 
-    val bindingFuture = Http().bindAndHandle(route, "0.0.0.0", 8888)
+    val bindingFuture = Http().bindAndHandle(route, interface, port)
 
-    println(s"Server online at http://localhost:8888/\nPress RETURN to stop...")
+    println(s"Server online at http://$interface:$port/\nPress RETURN to stop...")
     StdIn.readLine() // let it run until user presses return
     bindingFuture
       .flatMap(_.unbind()) // trigger unbinding from the port