From efc08efa3471e904ef7571c99e006c87aadd1ffb Mon Sep 17 00:00:00 2001
From: wenxu12345 <44203734@qq.com>
Date: Wed, 1 Dec 2021 13:57:28 +0800
Subject: [PATCH] script

---
 script/docker_check_service.sh | 34 +++++-----------------------------
 script/docker_start_all.sh     | 17 +----------------
 2 files changed, 6 insertions(+), 45 deletions(-)

diff --git a/script/docker_check_service.sh b/script/docker_check_service.sh
index c987f3d8b..f65dda3cc 100644
--- a/script/docker_check_service.sh
+++ b/script/docker_check_service.sh
@@ -1,33 +1,9 @@
 #!/usr/bin/env bash
+echo "docker-compose ps....................."
+docker-compose ps
 
-source ./style_info.cfg
+sleep 10
 
-docker_compose_components=(
-  etcd
-  mongo
-  mysql
-  open_im_server
-  redis
-  kafka
-  zookeeper
-)
+echo "check OpenIM.........................."
+./check_all.sh
 
-component_server_count=0
-
-for ((i = 0; i < ${#docker_compose_components[*]}; i++)); do
-  component_server="docker-compose ps|grep -w ${docker_compose_components[$i]}|grep Up"
-  count="${component_server}|wc -l"
-
-  if [ $(eval ${count}) -gt 0 ]; then
-    echo -e "${SKY_BLUE_PREFIX}docker-compose ${docker_compose_components[$i]} is Up!${COLOR_SUFFIX}"
-    let component_server_count+=1
-  else
-    echo -e "${RED_PREFIX} ${docker_compose_components[$i]} start failed!${COLOR_SUFFIX}"
-  fi
-done
-
-if [ ${component_server_count} -eq 7 ]; then
-  echo -e "${YELLOW_PREFIX}\ndocker-compose all services is Up!${COLOR_SUFFIX}"
-else
-  echo -e "${RED_PREFIX}\nsome docker-compose services start failed,please check red logs on console ${COLOR_SUFFIX}"
-fi
diff --git a/script/docker_start_all.sh b/script/docker_start_all.sh
index 5d0c19b2e..f1a1fd859 100644
--- a/script/docker_start_all.sh
+++ b/script/docker_start_all.sh
@@ -1,24 +1,9 @@
 #!/usr/bin/env bash
-#fixme This script is the total startup script
-#fixme The full name of the shell script that needs to be started is placed in the need_to_start_server_shell array
-
-#fixme Put the shell script name here
-need_to_start_server_shell=(
-  start_rpc_service.sh
-  msg_gateway_start.sh
-  push_start.sh
-  msg_transfer_start.sh
-  sdk_svr_start.sh
-  timer_start.sh
-)
 
 #fixme The 10 second delay to start the project is for the docker-compose one-click to start openIM when the infrastructure dependencies are not started
 sleep 10
 
-for i in ${need_to_start_server_shell[*]}; do
-  chmod +x $i
-  ./$i
-done
+./start_all.sh
 
 sleep 15