dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #312 from mp-loki/master

Browse Source 
install_dev_db scripts error code fixed
This commit is contained in:
Valerii Sosliuk 2017-09-29 15:16:15 -04:00 committed by GitHub
commit f94aee19ab
4 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
application/src/main/java/org/thingsboard/server/ThingsboardInstallApplication.java
View File

@ -16,6 +16,7 @@
package org.thingsboard.server; package org.thingsboard.server;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.SpringBootConfiguration; import org.springframework.boot.SpringBootConfiguration;
import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.ConfigurableApplicationContext;
@ -24,6 +25,7 @@ import org.thingsboard.server.install.ThingsboardInstallService;
import java.util.Arrays; import java.util.Arrays;
@Slf4j
@SpringBootConfiguration @SpringBootConfiguration
@ComponentScan({"org.thingsboard.server.install", @ComponentScan({"org.thingsboard.server.install",
"org.thingsboard.server.service.component", "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"; private static final String DEFAULT_SPRING_CONFIG_PARAM = SPRING_CONFIG_NAME_KEY + "=" + "thingsboard";
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication application = new SpringApplication(ThingsboardInstallApplication.class); try {
application.setAdditionalProfiles("install"); SpringApplication application = new SpringApplication(ThingsboardInstallApplication.class);
ConfigurableApplicationContext context = application.run(updateArguments(args)); application.setAdditionalProfiles("install");
context.getBean(ThingsboardInstallService.class).performInstall(); 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) { private static String[] updateArguments(String[] args) {

2
application/src/main/scripts/install/install_dev_db.sh
View File

@ -25,7 +25,7 @@ loadDemo=true
export JAVA_OPTS="$JAVA_OPTS -Dplatform=@pkg.platform@" export JAVA_OPTS="$JAVA_OPTS -Dplatform=@pkg.platform@"
export LOADER_PATH=${BASE}/conf,${BASE}/extensions export LOADER_PATH=${BASE}/conf,${BASE}/extensions
export SQL_DATA_FOLDER=/tmp export SQL_DATA_FOLDER=${SQL_DATA_FOLDER:-/tmp}
run_user=thingsboard run_user=thingsboard

8
application/src/main/scripts/install/logback.xml
View File

@ -48,6 +48,14 @@
<appender-ref ref="STDOUT" /> <appender-ref ref="STDOUT" />
</logger> </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="org.thingsboard.server" level="INFO" />
<logger name="akka" level="INFO" /> <logger name="akka" level="INFO" />

8
application/src/main/scripts/windows/install_dev_db.bat
View File

@ -4,12 +4,14 @@ setlocal ENABLEEXTENSIONS
SET BASE=${project.basedir}\target SET BASE=${project.basedir}\target
SET LOADER_PATH=%BASE%\conf,%BASE%\extensions SET LOADER_PATH=%BASE%\conf,%BASE%\extensions
SET SQL_DATA_FOLDER=%~dp0\tmp
SET jarfile=%BASE%\thingsboard-${project.version}-boot.jar SET jarfile=%BASE%\thingsboard-${project.version}-boot.jar
SET installDir=%BASE%\data SET installDir=%BASE%\data
SET loadDemo=true 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^ java -cp %jarfile% -Dloader.main=org.thingsboard.server.ThingsboardInstallApplication^
-Dinstall.data_dir=%installDir%^ -Dinstall.data_dir=%installDir%^
@ -19,7 +21,7 @@ java -cp %jarfile% -Dloader.main=org.thingsboard.server.ThingsboardInstallApplic
-Dlogging.config=%BASE%\windows\install\logback.xml^ -Dlogging.config=%BASE%\windows\install\logback.xml^
org.springframework.boot.loader.PropertiesLauncher org.springframework.boot.loader.PropertiesLauncher
if NOT errorlevel == 0 ( if errorlevel 1 (
@echo ThingsBoard DB installation failed! @echo ThingsBoard DB installation failed!
POPD POPD
exit /b %errorlevel% exit /b %errorlevel%