Support running in the foreground #406
(cherry picked from commit dcbc2564ea)
This commit is contained in:
committed by
hongqiaowei
parent
01b5a03324
commit
c2cd402b52
@@ -35,6 +35,9 @@ if [ -z "$JAVA_HOME" ]; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Run in the foreground
|
||||||
|
PARAM_2=$2
|
||||||
|
|
||||||
#进入脚本所在目录
|
#进入脚本所在目录
|
||||||
cd `dirname $0`
|
cd `dirname $0`
|
||||||
|
|
||||||
@@ -104,7 +107,12 @@ start() {
|
|||||||
else
|
else
|
||||||
echo "starting $APP_NAME ..."
|
echo "starting $APP_NAME ..."
|
||||||
rm -f ${PID_FILE}
|
rm -f ${PID_FILE}
|
||||||
|
if [[ ${PARAM_2} == "f" ]]
|
||||||
|
then
|
||||||
|
${JAVA_CMD} -jar ${JAVA_OPTS} -Dlogging.config=${APP_DEP_DIR}/log4j2-spring.xml -Dspring.profiles.active=$SPRING_PROFILES_ACTIVE -Denv=$APOLLO_ENV -Dapollo.meta=${APOLLO_META_SERVER} ${APP_DEP_DIR}/${APP_NAME}
|
||||||
|
else
|
||||||
${JAVA_CMD} -jar ${JAVA_OPTS} -Dlogging.config=${APP_DEP_DIR}/log4j2-spring.xml -Dspring.profiles.active=$SPRING_PROFILES_ACTIVE -Denv=$APOLLO_ENV -Dapollo.meta=${APOLLO_META_SERVER} ${APP_DEP_DIR}/${APP_NAME} > ${APP_LOG_DIR}/${APP_NAME}.log 2>&1 &
|
${JAVA_CMD} -jar ${JAVA_OPTS} -Dlogging.config=${APP_DEP_DIR}/log4j2-spring.xml -Dspring.profiles.active=$SPRING_PROFILES_ACTIVE -Denv=$APOLLO_ENV -Dapollo.meta=${APOLLO_META_SERVER} ${APP_DEP_DIR}/${APP_NAME} > ${APP_LOG_DIR}/${APP_NAME}.log 2>&1 &
|
||||||
|
fi
|
||||||
echo $! > ${PID_FILE}
|
echo $! > ${PID_FILE}
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,4 +2,4 @@
|
|||||||
|
|
||||||
# entrypoint for docker
|
# entrypoint for docker
|
||||||
|
|
||||||
/bin/bash ./boot.sh start && touch dummy.log && tail -f dummy.log
|
/bin/bash ./boot.sh start f
|
||||||
Reference in New Issue
Block a user