diff options
author | Jakob Odersky <jakob@odersky.com> | 2016-04-18 03:33:08 -0700 |
---|---|---|
committer | Jakob Odersky <jakob@odersky.com> | 2016-04-18 03:33:08 -0700 |
commit | 552fde56cd19e766e2bd627ed8eea66dc4f15a8d (patch) | |
tree | 4fbd7617349ac62111e4a894dcc276834c5244c2 | |
parent | 8aecc40ecbd5149ef1b3bf753dd067cddf693085 (diff) | |
download | mavigator-552fde56cd19e766e2bd627ed8eea66dc4f15a8d.tar.gz mavigator-552fde56cd19e766e2bd627ed8eea66dc4f15a8d.tar.bz2 mavigator-552fde56cd19e766e2bd627ed8eea66dc4f15a8d.zip |
Use config to set server parameters
-rw-r--r-- | mavigator-server/src/main/resources/reference.conf | 5 | ||||
-rw-r--r-- | 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() |