From 7a61a59a4c216533e597e97c7d399ffa1b625ea0 Mon Sep 17 00:00:00 2001 From: cyjseagull Date: Wed, 11 Dec 2024 16:36:32 +0800 Subject: [PATCH] fix start.sh --- docker-files/site/Dockerfile | 2 +- .../wedpr_builder/config/wedpr_deploy_config.py | 3 ++- .../wedpr_builder/tpl/nginx/nginx.conf | 4 +--- wedpr-pir/bin/start.sh | 17 ++++++++++++++--- wedpr-site/bin/start.sh | 16 +++++++++++++--- wedpr-worker/bin/start.sh | 17 +++++++++-------- 6 files changed, 40 insertions(+), 19 deletions(-) diff --git a/docker-files/site/Dockerfile b/docker-files/site/Dockerfile index c2945756..df3dae7f 100644 --- a/docker-files/site/Dockerfile +++ b/docker-files/site/Dockerfile @@ -66,4 +66,4 @@ COPY --from=builder /WeDPR/wedpr-site/dist/ /data/home/wedpr/wedpr-site # copy the web package COPY --from=web_builder /WeDPR/wedpr-web/dist /data/home/wedpr/wedpr-site/web -ENTRYPOINT ["/bin/bash", "/data/home/wedpr/wedpr-site/start.sh", "true", "&&", "/usr/sbin/nginx"] +ENTRYPOINT ["/usr/sbin/nginx","&&", "/bin/bash", "/data/home/wedpr/wedpr-site/start.sh", "true"] diff --git a/wedpr-builder/wedpr_builder/config/wedpr_deploy_config.py b/wedpr-builder/wedpr_builder/config/wedpr_deploy_config.py index 61425033..ecd51e96 100644 --- a/wedpr-builder/wedpr_builder/config/wedpr_deploy_config.py +++ b/wedpr-builder/wedpr_builder/config/wedpr_deploy_config.py @@ -406,7 +406,8 @@ def to_nginx_properties(self, nginx_listen_port): def to_properties(self, deploy_ip, node_index: int) -> {}: props = {} server_start_port = self.server_start_port + 3 * node_index - self.server_backend_list.append(f"{deploy_ip}:{server_start_port}") + self.server_backend_list.append( + f"server {deploy_ip}:{server_start_port}") # nodeid node_id = f"{self.service_type}-{self.env_config.zone}-node{node_index}" props.update({constant.ConfigProperities.WEDPR_NODE_ID: node_id}) diff --git a/wedpr-builder/wedpr_builder/tpl/nginx/nginx.conf b/wedpr-builder/wedpr_builder/tpl/nginx/nginx.conf index aeec3381..c5bb5cf1 100644 --- a/wedpr-builder/wedpr_builder/tpl/nginx/nginx.conf +++ b/wedpr-builder/wedpr_builder/tpl/nginx/nginx.conf @@ -67,6 +67,4 @@ server { error_log /var/log/nginx/error.log; include /etc/nginx/conf.d/*.conf; include /etc/nginx/sites-enabled/*; -} - -daemon off; \ No newline at end of file +} \ No newline at end of file diff --git a/wedpr-pir/bin/start.sh b/wedpr-pir/bin/start.sh index 25ea39a7..d5fc4c89 100644 --- a/wedpr-pir/bin/start.sh +++ b/wedpr-pir/bin/start.sh @@ -13,6 +13,13 @@ STATUS_STARTING="Starting" STATUS_RUNNING="Running" STATUS_STOPPED="Stopped" start_success_log="start.*success" +ENABLE_DOCKER_MODE="false" + +start_log="start.out" +if [ "$ENABLE_DOCKER_MODE" = "true" ]; then + start_log="logs/start.out" +fi + JAVA_CMD=$JAVA_HOME/bin/java if [ ! -f "${JAVA_HOME}" ];then @@ -46,13 +53,17 @@ JAVA_OPTS+=" -DserviceConfigPath=${CONFIG_PATH}" run_app() { - nohup $JAVA_CMD $JAVA_OPTS -cp $CLASSPATH $APP_MAIN > start.out 2>&1 & + if [ "$ENABLE_DOCKER_MODE" = "true" ]; then + exec ${JAVA_CMD} $JAVA_OPTS -cp $CLASSPATH $APP_MAIN > ${start_log} 2>&1 + else + nohup $JAVA_CMD $JAVA_OPTS -cp $CLASSPATH $APP_MAIN > ${start_log} 2>&1 & + fi } app_status() { if [ ! -z "$(app_pid)" ]; then - if [ ! -z "$(grep -i "${start_success_log}" start.out)" ]; then + if [ ! -z "$(grep -i "${start_success_log}" ${start_log})" ]; then echo ${STATUS_RUNNING} else echo ${STATUS_STARTING} @@ -84,7 +95,7 @@ before_start() } start(){ - rm -f start.out + rm -f ${start_log} run_app LOG_INFO "${APP_MAIN} booting up .." try_times=45 diff --git a/wedpr-site/bin/start.sh b/wedpr-site/bin/start.sh index 8911e4d0..c8bfd018 100644 --- a/wedpr-site/bin/start.sh +++ b/wedpr-site/bin/start.sh @@ -11,6 +11,12 @@ STATUS_STARTING="Starting" STATUS_RUNNING="Running" STATUS_STOPPED="Stopped" start_success_log="start.*success" +ENABLE_DOCKER_MODE="false" + +start_log="start.out" +if [ "$ENABLE_DOCKER_MODE" = "true" ]; then + start_log="logs/start.out" +fi JAVA_CMD=$JAVA_HOME/bin/java @@ -44,13 +50,17 @@ JAVA_OPTS+=" -DserviceName=${SERVER_NAME}" JAVA_OPTS+=" -DserviceConfigPath=${CONFIG_PATH}" run_app() { - nohup ${JAVA_CMD} $JAVA_OPTS -cp $CLASSPATH $APP_MAIN > start.out 2>&1 & + if [ "$ENABLE_DOCKER_MODE" = "true" ]; then + exec ${JAVA_CMD} $JAVA_OPTS -cp $CLASSPATH $APP_MAIN > ${start_log} 2>&1 + else + nohup ${JAVA_CMD} $JAVA_OPTS -cp $CLASSPATH $APP_MAIN > ${start_log} 2>&1 & + fi } app_status() { if [ ! -z "$(app_pid)" ]; then - if [ ! -z "$(grep -i "${start_success_log}" start.out)" ]; then + if [ ! -z "$(grep -i "${start_success_log}" ${start_log})" ]; then echo ${STATUS_RUNNING} else echo ${STATUS_STARTING} @@ -82,7 +92,7 @@ before_start() } start(){ - rm -f start.out + rm -f ${start_log} run_app LOG_INFO "${APP_MAIN} booting up .." try_times=45 diff --git a/wedpr-worker/bin/start.sh b/wedpr-worker/bin/start.sh index a14ea3b2..be45e1c7 100644 --- a/wedpr-worker/bin/start.sh +++ b/wedpr-worker/bin/start.sh @@ -15,10 +15,11 @@ STATUS_STOPPED="Stopped" start_success_log="start.*success" ENABLE_DOCKER_MODE="false" -#if [ "${JAVA_HOME}" = "" ];then -# JAVA_HOME=/nemo/jdk8u382-b05 -# echo "JAVA_HOME has not been configured, set to default: ${JAVA_HOME}" -#fi +start_log="start.out" +if [ "$ENABLE_DOCKER_MODE" = "true" ]; then + start_log="logs/start.out" +fi + JAVA_CMD=$JAVA_HOME/bin/java if [ ! -f "${JAVA_HOME}" ];then @@ -51,16 +52,16 @@ JAVA_OPTS+=" -DserviceConfigPath=${CONFIG_PATH}" run_app() { if [ "$ENABLE_DOCKER_MODE" = "true" ]; then - exec ${JAVA_CMD} $JAVA_OPTS -cp $CLASSPATH $APP_MAIN > start.out 2>&1 + exec ${JAVA_CMD} $JAVA_OPTS -cp $CLASSPATH $APP_MAIN > ${start_log} 2>&1 else - nohup ${JAVA_CMD} $JAVA_OPTS -cp $CLASSPATH $APP_MAIN > start.out 2>&1 & + nohup ${JAVA_CMD} $JAVA_OPTS -cp $CLASSPATH $APP_MAIN > ${start_log} 2>&1 & fi } app_status() { if [ ! -z "$(app_pid)" ]; then - if [ ! -z "$(grep -i "${start_success_log}" start.out)" ]; then + if [ ! -z "$(grep -i "${start_success_log}" ${start_log})" ]; then echo ${STATUS_RUNNING} else echo ${STATUS_STARTING} @@ -92,7 +93,7 @@ before_start() } start(){ - rm -f start.out + rm -f ${start_log} run_app LOG_INFO "${APP_MAIN} booting up .." try_times=45