Merge main into sweep/fix-incorrect-links

scripts/msg_gateway_start.sh

@@ -78,5 +78,5 @@ if [ $check -ge 1 ]; then
   echo -e ${SKY_BLUE_PREFIX}"PID: "${COLOR_SUFFIX}${BACKGROUND_GREEN}${allNewPid}${COLOR_SUFFIX}
   echo -e ${SKY_BLUE_PREFIX}"LISTENING_PORT: "${COLOR_SUFFIX}${BACKGROUND_GREEN}${allPorts}${COLOR_SUFFIX}
 else
-  echo -e ${BACKGROUND_GREEN}${openim_msggateway}${COLOR_SUFFIX}${RED_PREFIX}"\n SERVICE START ERROR, PLEASE CHECK openIM.log"${COLOR_SUFFIX}
+    exit -1
 fi

scripts/msg_transfer_start.sh

@@ -58,15 +58,15 @@ for ((i = 0; i < ${msg_transfer_service_num}; i++)); do
 done
 
 #Check launched service process
-check=`ps  | grep -w ./${openim_msgtransfer} | grep -v grep| wc -l`
+check=`ps  -axu| grep -w ./${openim_msgtransfer} | grep -v grep| wc -l`
 if [ $check -ge 1 ]
 then
-newPid=`ps  | grep -w ./${openim_msgtransfer} | grep -v grep|awk '{print $2}'`
+newPid=`ps  -axu| grep -w ./${openim_msgtransfer} | grep -v grep|awk '{print $2}'`
 allPorts=""
     echo -e ${SKY_BLUE_PREFIX}"SERVICE START SUCCESS "${COLOR_SUFFIX}
     echo -e ${SKY_BLUE_PREFIX}"SERVICE_NAME: "${COLOR_SUFFIX}${BACKGROUND_GREEN}${openim_msgtransfer}${COLOR_SUFFIX}
     echo -e ${SKY_BLUE_PREFIX}"PID: "${COLOR_SUFFIX}${BACKGROUND_GREEN}${newPid}${COLOR_SUFFIX}
     echo -e ${SKY_BLUE_PREFIX}"LISTENING_PORT: "${COLOR_SUFFIX}${BACKGROUND_GREEN}${allPorts}${COLOR_SUFFIX}
 else
-    echo -e ${BACKGROUND_GREEN}${openim_msgtransfer}${COLOR_SUFFIX}${RED_PREFIX}"\n SERVICE START ERROR, PLEASE CHECK openIM.log"${COLOR_SUFFIX}
+    exit -1
 fi

scripts/push_start.sh

@@ -60,9 +60,9 @@ done
 
 sleep 3
 #Check launched service process
-check=$(ps  | grep -w ./${push_name} | grep -v grep | wc -l)
+check=$(ps  -axu| grep -w ./${push_name} | grep -v grep | wc -l)
 if [ $check -ge 1 ]; then
-  newPid=$(ps  | grep -w ./${push_name} | grep -v grep | awk '{print $2}')
+  newPid=$(ps  -axu| grep -w ./${push_name} | grep -v grep | awk '{print $2}')
   ports=$(netstat -netulp | grep -w ${newPid} | awk '{print $4}' | awk -F '[:]' '{print $NF}')
   allPorts=""
 
@@ -74,5 +74,5 @@ if [ $check -ge 1 ]; then
   echo -e ${SKY_BLUE_PREFIX}"PID: "${COLOR_SUFFIX}${BACKGROUND_GREEN}${newPid}${COLOR_SUFFIX}
   echo -e ${SKY_BLUE_PREFIX}"LISTENING_PORT: "${COLOR_SUFFIX}${BACKGROUND_GREEN}${allPorts}${COLOR_SUFFIX}
 else
-  echo -e ${BACKGROUND_GREEN}${push_name}${COLOR_SUFFIX}${RED_PREFIX}"\n SERVICE START ERROR, PLEASE CHECK openIM.log"${COLOR_SUFFIX}
+    exit -1
 fi

scripts/start_all.sh

@@ -85,7 +85,7 @@ echo -e ""
 ./$component_check
 if [ $? -ne 0 ]; then
   # Print error message and exit
-  echo -e "${BOLD_PREFIX}${RED_PREFIX}Error executing ${component_check}. Exiting...${COLOR_SUFFIX}"
+  echo -e "${RED_BOLD}Error executing ${component_check}. Exiting...${COLOR_SUFFIX}"
   exit -1
 fi
 
@@ -105,7 +105,7 @@ for i in ${need_to_start_server_shell[*]}; do
   if [ $? -ne
    ]; then
     # Print error message and exit
-    echo "${BOLD_PREFIX}${RED_PREFIX}Error executing ${i}. Exiting...${COLOR_SUFFIX}"
+    echo -e "${RED_PREFIX}${BOLD_PREFIX}Error executing ${i}. Exiting(please check open-im-server/logs/openIM.log)... ${COLOR_SUFFIX}"
     exit -1
   fi
 done

scripts/start_cron.sh

@@ -50,15 +50,15 @@ nohup ./${cron_task_name}  >>$OPENIM_ROOT/logs/openIM.log 2>&1 &
 #done
 
 #Check launched service process
-check=`ps  | grep -w ./${cron_task_name} | grep -v grep| wc -l`
+check=`ps  -axu| grep -w ./${cron_task_name} | grep -v grep| wc -l`
 if [ $check -ge 1 ]
 then
-newPid=`ps  | grep -w ./${cron_task_name} | grep -v grep|awk '{print $2}'`
+newPid=`ps  -axu| grep -w ./${cron_task_name} | grep -v grep|awk '{print $2}'`
 allPorts=""
     echo -e ${SKY_BLUE_PREFIX}"SERVICE START SUCCESS "${COLOR_SUFFIX}
     echo -e ${SKY_BLUE_PREFIX}"SERVICE_NAME: "${COLOR_SUFFIX}${BACKGROUND_GREEN}${cron_task_name}${COLOR_SUFFIX}
     echo -e ${SKY_BLUE_PREFIX}"PID: "${COLOR_SUFFIX}${BACKGROUND_GREEN}${newPid}${COLOR_SUFFIX}
     echo -e ${SKY_BLUE_PREFIX}"LISTENING_PORT: "${COLOR_SUFFIX}${BACKGROUND_GREEN}${allPorts}${COLOR_SUFFIX}
 else
-    echo -e ${BACKGROUND_GREEN}${cron_task_name}${COLOR_SUFFIX}${RED_PREFIX}"\n SERVICE START ERROR, PLEASE CHECK openIM.log"${COLOR_SUFFIX}
+    exit -1
 fi

scripts/style_info.sh

@@ -61,6 +61,7 @@ function style-info() {
     BACKGROUND_LIGHT_PURPLE="\033[105m"  # Light purple background
     BACKGROUND_LIGHT_SKY_BLUE="\033[106m"  # Light sky blue background
     BACKGROUND_LIGHT_WHITE="\033[107m"  # Light white background
+
 }
 
 style-info