Commit dc4261b4d0e645326bd8d48f4ee008c7e06c3b67

Authored by mp-loki
1 parent 7659ef4b

TB-311 ThingsboardInstallApplication exit code fixed

... ... @@ -16,6 +16,7 @@
16 16
17 17 package org.thingsboard.server;
18 18
  19 +import lombok.extern.slf4j.Slf4j;
19 20 import org.springframework.boot.SpringApplication;
20 21 import org.springframework.boot.SpringBootConfiguration;
21 22 import org.springframework.context.ConfigurableApplicationContext;
... ... @@ -24,6 +25,7 @@ import org.thingsboard.server.install.ThingsboardInstallService;
24 25
25 26 import java.util.Arrays;
26 27
  28 +@Slf4j
27 29 @SpringBootConfiguration
28 30 @ComponentScan({"org.thingsboard.server.install",
29 31 "org.thingsboard.server.service.component",
... ... @@ -35,10 +37,15 @@ public class ThingsboardInstallApplication {
35 37 private static final String DEFAULT_SPRING_CONFIG_PARAM = SPRING_CONFIG_NAME_KEY + "=" + "thingsboard";
36 38
37 39 public static void main(String[] args) {
38   - SpringApplication application = new SpringApplication(ThingsboardInstallApplication.class);
39   - application.setAdditionalProfiles("install");
40   - ConfigurableApplicationContext context = application.run(updateArguments(args));
41   - context.getBean(ThingsboardInstallService.class).performInstall();
  40 + try {
  41 + SpringApplication application = new SpringApplication(ThingsboardInstallApplication.class);
  42 + application.setAdditionalProfiles("install");
  43 + ConfigurableApplicationContext context = application.run(updateArguments(args));
  44 + context.getBean(ThingsboardInstallService.class).performInstall();
  45 + } catch (Exception e) {
  46 + log.error(e.getMessage());
  47 + System.exit(1);
  48 + }
42 49 }
43 50
44 51 private static String[] updateArguments(String[] args) {
... ...
... ... @@ -48,6 +48,14 @@
48 48 <appender-ref ref="STDOUT" />
49 49 </logger>
50 50
  51 + <logger name="org.thingsboard.server.ThingsboardInstallApplication" level="ERROR">
  52 + <appender-ref ref="STDOUT" />
  53 + </logger>
  54 +
  55 + <logger name="org.apache.tomcat.jdbc.pool" level="ERROR">
  56 + <appender-ref ref="STDOUT" />
  57 + </logger>
  58 +
51 59 <logger name="org.thingsboard.server" level="INFO" />
52 60 <logger name="akka" level="INFO" />
53 61
... ...
... ... @@ -21,7 +21,7 @@ java -cp %jarfile% -Dloader.main=org.thingsboard.server.ThingsboardInstallApplic
21 21 -Dlogging.config=%BASE%\windows\install\logback.xml^
22 22 org.springframework.boot.loader.PropertiesLauncher
23 23
24   -if NOT errorlevel == 0 (
  24 +if NOT %errorlevel% == 0 (
25 25 @echo ThingsBoard DB installation failed!
26 26 POPD
27 27 exit /b %errorlevel%
... ...