mhop/ha-bridge
1
0
Fork 0
mirror of https://github.com/bwssytems/ha-bridge.git synced 2025-12-25 18:15:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bulk add race conditions. added save capability into UI. UI

Browse Source 
settings layout update.
This commit is contained in:
Admin
2016-02-12 15:51:38 -06:00
parent 7b45ca9438
commit c97ab2cd38
13 changed files with 268 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/bwssystems/HABridge/HABridge.java
View File

@@ -46,15 +46,13 @@ public class HABridge {
log.info("HA Bridge (v" + theVersion.getVersion() + ") starting....");
bridgeSettings = new BridgeSettings();
bridgeSettings.setReinit(false);
bridgeSettings.setStop(false);
while(!bridgeSettings.isStop()) {
while(!bridgeSettings.getBridgeControl().isStop()) {
bridgeSettings.buildSettings();
log.info("HA Bridge (v" + theVersion.getVersion() + ") initializing....");
// sparkjava config directive to set ip address for the web server to listen on
// ipAddress("0.0.0.0"); // not used
// sparkjava config directive to set port for the web server to listen on
port(Integer.valueOf(bridgeSettings.getServerPort()));
port(Integer.valueOf(bridgeSettings.getBridgeSettingsDescriptor().getServerPort()));
// sparkjava config directive to set html static file location for Jetty
staticFileLocation("/public");
// setup system control api first
@@ -76,11 +74,11 @@ public class HABridge {
awaitInitialization();
// start the upnp ssdp discovery listener
theUpnpListener = new UpnpListener(bridgeSettings);
theUpnpListener = new UpnpListener(bridgeSettings.getBridgeSettingsDescriptor(), bridgeSettings.getBridgeControl());
if(theUpnpListener.startListening())
log.info("HA Bridge (v" + theVersion.getVersion() + ") reinitialization requessted....");
bridgeSettings.setReinit(false);
bridgeSettings.getBridgeControl().setReinit(false);
stop();
}
log.info("HA Bridge (v" + theVersion.getVersion() + ") exiting....");