From dc4261b4d0e645326bd8d48f4ee008c7e06c3b67 Mon Sep 17 00:00:00 2001
From: mp-loki <valerii.sosliuk@gmail.com>
Date: Thu, 28 Sep 2017 22:56:09 -0400
Subject: [PATCH] TB-311 ThingsboardInstallApplication exit code fixed

---
 .../server/ThingsboardInstallApplication.java     | 15 +++++++++++----
 application/src/main/scripts/install/logback.xml  |  8 ++++++++
 .../src/main/scripts/windows/install_dev_db.bat   |  2 +-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/ThingsboardInstallApplication.java b/application/src/main/java/org/thingsboard/server/ThingsboardInstallApplication.java
index 3caca2b6e8..8d54d25add 100644
--- a/application/src/main/java/org/thingsboard/server/ThingsboardInstallApplication.java
+++ b/application/src/main/java/org/thingsboard/server/ThingsboardInstallApplication.java
@@ -16,6 +16,7 @@
 
 package org.thingsboard.server;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.SpringBootConfiguration;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -24,6 +25,7 @@ import org.thingsboard.server.install.ThingsboardInstallService;
 
 import java.util.Arrays;
 
+@Slf4j
 @SpringBootConfiguration
 @ComponentScan({"org.thingsboard.server.install",
         "org.thingsboard.server.service.component",
@@ -35,10 +37,15 @@ public class ThingsboardInstallApplication {
     private static final String DEFAULT_SPRING_CONFIG_PARAM = SPRING_CONFIG_NAME_KEY + "=" + "thingsboard";
 
     public static void main(String[] args) {
-        SpringApplication application = new SpringApplication(ThingsboardInstallApplication.class);
-        application.setAdditionalProfiles("install");
-        ConfigurableApplicationContext context = application.run(updateArguments(args));
-        context.getBean(ThingsboardInstallService.class).performInstall();
+        try {
+            SpringApplication application = new SpringApplication(ThingsboardInstallApplication.class);
+            application.setAdditionalProfiles("install");
+            ConfigurableApplicationContext context = application.run(updateArguments(args));
+            context.getBean(ThingsboardInstallService.class).performInstall();
+        } catch (Exception e) {
+            log.error(e.getMessage());
+            System.exit(1);
+        }
     }
 
     private static String[] updateArguments(String[] args) {
diff --git a/application/src/main/scripts/install/logback.xml b/application/src/main/scripts/install/logback.xml
index aadd92fcc3..b2535ccce9 100644
--- a/application/src/main/scripts/install/logback.xml
+++ b/application/src/main/scripts/install/logback.xml
@@ -48,6 +48,14 @@
         <appender-ref ref="STDOUT" />
     </logger>
 
+    <logger name="org.thingsboard.server.ThingsboardInstallApplication" level="ERROR">
+        <appender-ref ref="STDOUT" />
+    </logger>
+
+    <logger name="org.apache.tomcat.jdbc.pool" level="ERROR">
+        <appender-ref ref="STDOUT" />
+    </logger>
+
     <logger name="org.thingsboard.server" level="INFO" />
     <logger name="akka" level="INFO" />
 
diff --git a/application/src/main/scripts/windows/install_dev_db.bat b/application/src/main/scripts/windows/install_dev_db.bat
index cf8c98c87f..efc3c9d3f7 100644
--- a/application/src/main/scripts/windows/install_dev_db.bat
+++ b/application/src/main/scripts/windows/install_dev_db.bat
@@ -21,7 +21,7 @@ java -cp %jarfile% -Dloader.main=org.thingsboard.server.ThingsboardInstallApplic
                     -Dlogging.config=%BASE%\windows\install\logback.xml^
                     org.springframework.boot.loader.PropertiesLauncher
 
-if NOT errorlevel == 0 (
+if NOT %errorlevel% == 0 (
    @echo ThingsBoard DB installation failed!
    POPD
    exit /b %errorlevel%