OpenSource/hertzbeat
Public Access
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[script]bugfix 修复安装包启动脚本

Browse Source
This commit is contained in:
tomsun28
2022-02-16 14:22:00 +08:00
parent 6d37d5bc14
commit a4abe0e241
1 changed files with 9 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
script/assembly/server/bin/startup.sh
View File

@@ -19,9 +19,8 @@ DEPLOY_DIR=`pwd`
# 外部配置文件绝对目录,如果是目录需要/结尾，也可以直接指定文件 # 外部配置文件绝对目录,如果是目录需要/结尾，也可以直接指定文件
# 如果指定的是目录,spring则会读取目录中的所有配置文件 # 如果指定的是目录,spring则会读取目录中的所有配置文件
CONF_DIR=$DEPLOY_DIR/config CONF_DIR=$DEPLOY_DIR/config
# SERVER_PORT=`sed '/server.port/!d;s/.*=//' config/application.properties | tr -d '\r'` # 应用的端口号
# 获取应用的端口号 SERVER_PORT=1157
SERVER_PORT=`sed -nr '/port: [0-9]+/ s/.*port: +([0-9]+).*/\1/p' config/application.yml`
PIDS=`ps -f | grep java | grep "$CONF_DIR" |awk '{print $2}'` PIDS=`ps -f | grep java | grep "$CONF_DIR" |awk '{print $2}'`
if [ "$1" = "status" ]; then if [ "$1" = "status" ]; then
@@ -55,30 +54,15 @@ LOGS_DIR=$DEPLOY_DIR/logs
if [ ! -d $LOGS_DIR ]; then if [ ! -d $LOGS_DIR ]; then
mkdir $LOGS_DIR mkdir $LOGS_DIR
fi fi
STDOUT_FILE=$LOGS_DIR/catalina.log
# JVM Configuration # JVM Configuration
JAVA_OPTS=" -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true " JAVA_OPTS=" -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true "
JAVA_DEBUG_OPTS=""
if [ "$1" = "debug" ]; then
JAVA_DEBUG_OPTS=" -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n "
fi
JAVA_JMX_OPTS="" JAVA_MEM_OPTS=" -server -Xms512m -Xmx512m -XX:SurvivorRatio=2 -XX:+UseParallelGC "
if [ "$1" = "jmx" ]; then
JAVA_JMX_OPTS=" -Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false "
fi
JAVA_MEM_OPTS=""
BITS=`java -version 2>&1 | grep -i 64-bit`
if [ -n "$BITS" ]; then
JAVA_MEM_OPTS=" -server -Xmx512m -Xms512m -Xmn256m -XX:PermSize=128m -Xss256k -XX:+DisableExplicitGC -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseCMSCompactAtFullCollection -XX:LargePageSizeInBytes=128m -XX:+UseFastAccessorMethods -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=70 "
else
JAVA_MEM_OPTS=" -server -Xms512m -Xmx512m -XX:PermSize=128m -XX:SurvivorRatio=2 -XX:+UseParallelGC "
fi
# 加载外部log4j2文件的配置 # 加载外部log文件的配置
LOG_IMPL_FILE=log4j2.xml LOG_IMPL_FILE=logback-spring.xml
LOGGING_CONFIG="" LOGGING_CONFIG=""
if [ -f "$CONF_DIR/$LOG_IMPL_FILE" ] if [ -f "$CONF_DIR/$LOG_IMPL_FILE" ]
then then
@@ -86,11 +70,11 @@ then
fi fi
CONFIG_FILES=" -Dlogging.path=$LOGS_DIR $LOGGING_CONFIG -Dspring.config.location=$CONF_DIR/ " CONFIG_FILES=" -Dlogging.path=$LOGS_DIR $LOGGING_CONFIG -Dspring.config.location=$CONF_DIR/ "
echo -e "Starting the $SERVER_NAME ..." echo -e "Starting the $SERVER_NAME ..."
nohup java $JAVA_OPTS $JAVA_MEM_OPTS $JAVA_DEBUG_OPTS $JAVA_JMX_OPTS $CONFIG_FILES -jar $DEPLOY_DIR/lib/$JAR_NAME > $STDOUT_FILE 2>&1 & nohup java $JAVA_OPTS $JAVA_MEM_OPTS $CONFIG_FILES -jar $DEPLOY_DIR/$JAR_NAME >/dev/null 2>&1 &
COUNT=0 COUNT=0
while [ $COUNT -lt 1 ]; do while [ $COUNT -lt 1 ]; do
echo -e ".\c" echo "... "
sleep 1 sleep 1
if [ -n "$SERVER_PORT" ]; then if [ -n "$SERVER_PORT" ]; then
COUNT=`netstat -an | grep $SERVER_PORT | wc -l` COUNT=`netstat -an | grep $SERVER_PORT | wc -l`
@@ -102,8 +86,6 @@ while [ $COUNT -lt 1 ]; do
fi fi
done done
echo "Service starting OK!"
echo "OK!"
PIDS=`ps -f | grep java | grep "$DEPLOY_DIR" | awk '{print $2}'` PIDS=`ps -f | grep java | grep "$DEPLOY_DIR" | awk '{print $2}'`
echo "PID: $PIDS" echo "Service PID: $PIDS"
echo "STDOUT: $STDOUT_FILE"