Merge "SO BPMN Infra is not crashing when tomcat can't start - aim of this patch is to return non zero exit code when an exception occur in bpmn-infra" into honolulu

1 files changed, 9 insertions, 3 deletions

diff --git a/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/infrastructure/MSOInfrastructureApplication.java b/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/infrastructure/MSOInfrastructureApplication.java
index 477dce1072..8d6e133a1c 100644
--- a/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/infrastructure/MSOInfrastructureApplication.java
+++ b/bpmn/mso-infrastructure-bpmn/src/main/java/org/onap/so/bpmn/infrastructure/MSOInfrastructureApplication.java
@@ -79,6 +79,7 @@ public class MSOInfrastructureApplication {
     private static final String LOGS_DIR = "logs_dir";
     private static final String BPMN_SUFFIX = ".bpmn";
     private static final String SDC_SOURCE = "sdc";
+    private static final int CANNOT_INVOKE_COMMAND = 126;
 
 
     private static void setLogsDir() {
@@ -88,9 +89,14 @@ public class MSOInfrastructureApplication {
     }
 
     public static void main(String... args) {
-        SpringApplication.run(MSOInfrastructureApplication.class, args);
-        System.getProperties().setProperty("mso.config.path", ".");
-        setLogsDir();
+        try {
+            SpringApplication.run(MSOInfrastructureApplication.class, args);
+            System.getProperties().setProperty("mso.config.path", ".");
+            setLogsDir();
+        } catch (Exception e) {
+            logger.error("Exception has occurred during application startup. App will exit. ", e);
+            System.exit(CANNOT_INVOKE_COMMAND);
+        }
     }
 
     @PostConstruct