100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Stop container when any ContainerService throws an exception on start up
Rich Turner665d80cc7675
diff --git a/container/src/main/java/org/openremote/container/Container.java b/container/src/main/java/org/openremote/container/Container.javaindex 7c0ac0a41..0d0e92108 100644--- a/container/src/main/java/org/openremote/container/Container.java+++ b/container/src/main/java/org/openremote/container/Container.java@@ -35,6 +35,7 @@ import org.openremote.container.util.LogUtil;import java.util.*;import java.util.logging.Handler;+import java.util.logging.Level;import java.util.logging.Logger;import java.util.stream.Collectors;@@ -142,7 +143,7 @@ public class Container {return waitingThread != null;}- public void start() {+ public void start() throws Exception {synchronized (services) {if (isRunning())return;@@ -156,10 +157,9 @@ public class Container {LOG.fine("Starting service: " + service);service.start(Container.this);}- } catch (RuntimeException ex) {- throw ex;} catch (Exception ex) {- throw new RuntimeException(ex);+ LOG.log(Level.SEVERE, ">>> Runtime container startup failed", ex);+ throw ex;}LOG.info(">>> Runtime container startup complete");}diff --git a/manager/src/main/java/org/openremote/manager/Main.java b/manager/src/main/java/org/openremote/manager/Main.javaindex 8897825bc..359bf9913 100644--- a/manager/src/main/java/org/openremote/manager/Main.java+++ b/manager/src/main/java/org/openremote/manager/Main.java@@ -24,6 +24,14 @@ import org.openremote.container.Container;public class Main {public static void main(String[] args) throws Exception {- new Container().startBackground();++ Container container = new Container();++ try {+ container.startBackground();+ } catch (Exception e) {+ container.stop();+ System.exit(1);+ }}}