From d021c38e893cd8d4e69bc33961e71ef128bbf840 Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Sat, 29 Apr 2017 14:54:31 +0300
Subject: [PATCH] =?UTF-8?q?MCSM:=20=D0=B7=D0=B0=D0=B4=D0=B5=D0=B9=D1=81?=
 =?UTF-8?q?=D1=82=D0=B2=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=B3=D0=BB?=
 =?UTF-8?q?=D0=BE=D0=B1=D0=B0=D0=BB=D1=8C=D0=BD=D1=8B=D1=85=20=D0=BD=D0=B0?=
 =?UTF-8?q?=D1=81=D1=82=D1=80=D0=BE=D0=B5=D0=BA=20ASys?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mcserver-manager/build.gradle                       |  2 +-
 .../src/main/java/asys/mcsmanager/Activator.java    | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/mcserver-manager/build.gradle b/mcserver-manager/build.gradle
index d0cfd08..c0d01c2 100644
--- a/mcserver-manager/build.gradle
+++ b/mcserver-manager/build.gradle
@@ -1,5 +1,5 @@
 group = 'asys'
-version = '0.6.3-SNAPSHOT'
+version = '0.7-SNAPSHOT'
 
 apply plugin: 'osgi'
 
diff --git a/mcserver-manager/src/main/java/asys/mcsmanager/Activator.java b/mcserver-manager/src/main/java/asys/mcsmanager/Activator.java
index 53adeca..da3cb2a 100644
--- a/mcserver-manager/src/main/java/asys/mcsmanager/Activator.java
+++ b/mcserver-manager/src/main/java/asys/mcsmanager/Activator.java
@@ -4,6 +4,7 @@
  */
 package asys.mcsmanager;
 
+import asys.api.Config;
 import asys.mcsmanager.server.Server;
 import asys.webinterface.api.Webinterface;
 import org.osgi.framework.BundleActivator;
@@ -23,6 +24,11 @@ public class Activator implements BundleActivator, ServiceListener {
 
     @Override
     public void start(BundleContext context) throws Exception {
+        ServiceTracker<?, Config> serviceConfigTracker = new ServiceTracker<>(context, Config.class, null);
+        serviceConfigTracker.open();
+        Config config = serviceConfigTracker.getService();
+        if (config == null) throw new RuntimeException("Service 'Config' is not avalable!");
+
         module = new MCSM_WebModule();
 
         logger.debug("Get service: {}", Webinterface.class);
@@ -31,9 +37,12 @@ public class Activator implements BundleActivator, ServiceListener {
         logger.debug("Register service listener");
         context.addServiceListener(this);
 
-        logger.debug("Start server manager: {}:{}", "127.0.0.1", 8779);
+        String host = config.getString("asys.mcsmanager.host", "127.0.0.1");
+        int port = config.getInt("asys.mcsmanager.port", 8779);
+        logger.debug("Start server manager: {}:{}", host, port);
         serverManager = new Server();
-        serverManager.start("127.0.0.1", 8779);
+        serverManager.start(host, port);
+        serviceConfigTracker.close();
     }
 
     @Override