From e3a662e72958e95c0f1940fc0c6c21d9be324e4f Mon Sep 17 00:00:00 2001
From: chenc136 <chenc136@chinaunicom.cn>
Date: Tue, 28 May 2024 10:07:05 +0800
Subject: [PATCH] fix: cannot start if redis password is set

---
 script/server/sysom_hotfix_builder/init.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/script/server/sysom_hotfix_builder/init.sh b/script/server/sysom_hotfix_builder/init.sh
index b361b540..f3f58c62 100644
--- a/script/server/sysom_hotfix_builder/init.sh
+++ b/script/server/sysom_hotfix_builder/init.sh
@@ -5,6 +5,11 @@ BaseDir=$(dirname $(readlink -f "$0"))
 SERVICE_NAME=sysom-hotfix-builder
 NFS_SERVER_IP=${SERVER_LOCAL_IP}
 
+SYSOM_CONF=${SERVER_HOME}/target/conf/config.yml
+REDIS_HOST=`cat $SYSOM_CONF | grep db -A11 | grep redis -m 1 -A4 | grep host | awk '{print $NF}'`
+REDIS_PORT=`cat $SYSOM_CONF | grep db -A11 | grep redis -m 1 -A4 | grep port | awk '{print $NF}'`
+REDIS_PASSWORD=`cat $SYSOM_CONF | grep db -A11 | grep redis -m 1 -A4 | grep password | awk '{print $NF}'`
+
 mount_nfs()
 {
     HOTFIX_NFS_HOME=${SERVER_HOME}/hotfix_builder/hotfix-nfs
@@ -22,6 +27,12 @@ mount_nfs()
 }
 
 init_conf() {
+    if [ "${REDIS_PASSWORD}" != "" ]; then 
+        REDIS_SERVER="${REDIS_HOST}:${REDIS_PORT}?password=${REDIS_PASSWORD}"
+    else
+        REDIS_SERVER="${REDIS_HOST}:${REDIS_PORT}"
+    fi
+    sed -i "s#cec_url = redis://127.0.0.1:6379#cec_url = redis://${REDIS_SERVER}#g" ${SERVICE_NAME}.ini
     cp ${SERVICE_NAME}.ini /etc/supervisord.d/
     ###change the install dir base on param $1###
     sed -i "s;/usr/local/sysom;${APP_HOME};g" /etc/supervisord.d/${SERVICE_NAME}.ini
-- 
Gitee