From e7305f637164bb5071f32aa576746bb40d4bda96 Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Sat, 29 Apr 2017 14:51:42 +0300
Subject: [PATCH] =?UTF-8?q?WebInterface:=20=D0=B7=D0=B0=D0=B4=D0=B5=D0=B9?=
 =?UTF-8?q?=D1=81=D1=82=D0=B2=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=B3?=
 =?UTF-8?q?=D0=BB=D0=BE=D0=B1=D0=B0=D0=BB=D1=8C=D0=BD=D1=8B=D1=85=20=D0=BD?=
 =?UTF-8?q?=D0=B0=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

---
 webinterface/build.gradle                              |  2 +-
 .../src/main/java/asys/webinterface/Activator.java     | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/webinterface/build.gradle b/webinterface/build.gradle
index 32b3590..5001067 100644
--- a/webinterface/build.gradle
+++ b/webinterface/build.gradle
@@ -1,5 +1,5 @@
 group = 'asys'
-version = '0.17-SNAPSHOT'
+version = '0.18-SNAPSHOT'
 
 buildscript {
     repositories {
diff --git a/webinterface/src/main/java/asys/webinterface/Activator.java b/webinterface/src/main/java/asys/webinterface/Activator.java
index 3d52bf8..76b4534 100644
--- a/webinterface/src/main/java/asys/webinterface/Activator.java
+++ b/webinterface/src/main/java/asys/webinterface/Activator.java
@@ -4,10 +4,12 @@
  */
 package asys.webinterface;
 
+import asys.api.Config;
 import asys.webinterface.api.Webinterface;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
+import org.osgi.util.tracker.ServiceTracker;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -18,6 +20,11 @@ public class Activator implements BundleActivator {
 
     @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!");
+
         WebinterfaceImpl webinterface = new WebinterfaceImpl();
         webinterface.addModule(new Modules_WebModule(context));
 
@@ -25,7 +32,8 @@ public class Activator implements BundleActivator {
         serviceMainMenu = context.registerService(Webinterface.class, webinterface, null);
 
         webServer = new WebServer(context, webinterface);
-        webServer.start(8778);
+        webServer.start(config.getInt("asys.webinterface.port", 8778));
+        serviceConfigTracker.close();
     }
 
     @Override