From 552fde56cd19e766e2bd627ed8eea66dc4f15a8d Mon Sep 17 00:00:00 2001
From: Jakob Odersky <jakob@odersky.com>
Date: Mon, 18 Apr 2016 03:33:08 -0700
Subject: Use config to set server parameters

---
 mavigator-server/src/main/resources/reference.conf   | 5 +----
 mavigator-server/src/main/scala/mavigator/Main.scala | 8 +++++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/mavigator-server/src/main/resources/reference.conf b/mavigator-server/src/main/resources/reference.conf
index 85d609b..47ca9ae 100644
--- a/mavigator-server/src/main/resources/reference.conf
+++ b/mavigator-server/src/main/resources/reference.conf
@@ -1,12 +1,9 @@
 mavigator {
 
   # Interface to listen on for client connections
-  interface = "0.0.0.0"
+  interface = "::"
 
   # Port on which to listen for client connections
   port = 8080
 
-  # Mavlink system ID identifying this base station
-  system_id = 1
-
 }
\ No newline at end of file
diff --git a/mavigator-server/src/main/scala/mavigator/Main.scala b/mavigator-server/src/main/scala/mavigator/Main.scala
index 3ad1460..51bf532 100644
--- a/mavigator-server/src/main/scala/mavigator/Main.scala
+++ b/mavigator-server/src/main/scala/mavigator/Main.scala
@@ -13,6 +13,8 @@ object Main {
   implicit lazy val system = ActorSystem("mavigator")
   implicit lazy val materializer = ActorMaterializer()
 
+  lazy val config = system.settings.config.getConfig("mavigator")
+
   def main(args: Array[String]): Unit = {
     import system.dispatcher
 
@@ -22,7 +24,11 @@ object Main {
     Uav().init()
 
     system.log.info(s"Starting server...")
-    val binding = Http(system).bindAndHandle(route, "::", 8080)
+    val binding = Http(system).bindAndHandle(
+      route,
+      config.getString("interface"),
+      config.getInt("port")
+    )
 
     for (b <- binding) {
       val addr = b.localAddress.getHostString()
-- 
cgit v1.2.3