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/install_dev_db.sh b/application/src/main/scripts/install/install_dev_db.sh index fbab171157..8f64ad011c 100644 --- a/application/src/main/scripts/install/install_dev_db.sh +++ b/application/src/main/scripts/install/install_dev_db.sh @@ -25,7 +25,7 @@ loadDemo=true export JAVA_OPTS="$JAVA_OPTS -Dplatform=@pkg.platform@" export LOADER_PATH=${BASE}/conf,${BASE}/extensions -export SQL_DATA_FOLDER=/tmp +export SQL_DATA_FOLDER=${SQL_DATA_FOLDER:-/tmp} run_user=thingsboard 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 @@ + + + + + + + + diff --git a/application/src/main/scripts/windows/install_dev_db.bat b/application/src/main/scripts/windows/install_dev_db.bat index c993e26e8a..6abc80fef1 100644 --- a/application/src/main/scripts/windows/install_dev_db.bat +++ b/application/src/main/scripts/windows/install_dev_db.bat @@ -4,12 +4,14 @@ setlocal ENABLEEXTENSIONS SET BASE=${project.basedir}\target SET LOADER_PATH=%BASE%\conf,%BASE%\extensions -SET SQL_DATA_FOLDER=%~dp0\tmp + SET jarfile=%BASE%\thingsboard-${project.version}-boot.jar SET installDir=%BASE%\data SET loadDemo=true -SET SQL_DATA_FOLDER=/tmp +IF "%SQL_DATA_FOLDER%" == "" ( + SET SQL_DATA_FOLDER=/tmp +) java -cp %jarfile% -Dloader.main=org.thingsboard.server.ThingsboardInstallApplication^ -Dinstall.data_dir=%installDir%^ @@ -19,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 errorlevel 1 ( @echo ThingsBoard DB installation failed! POPD exit /b %errorlevel%