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 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