Merge branch 'tuoyun'

script/build_all_service.sh

@@ -24,8 +24,15 @@ begin_path=$PWD
 for ((i = 0; i < ${#service_source_root[*]}; i++)); do
   cd $begin_path
   service_path=${service_source_root[$i]}
-  cd $service_path && echo -e "${SKY_BLUE_PREFIX}Current directory: $PWD $COLOR_SUFFIX"
-  make install && echo -e "${SKY_BLUE_PREFIX}build ${service_names[$i]} success,moving binary file to the bin directory${COLOR_SUFFIX}" &&
-    echo -e "${SKY_BLUE_PREFIX}Successful moved ${service_names[$i]} to the bin directory${COLOR_SUFFIX}\n"
+  cd $service_path
+  make install
+  if [ $? -ne 0 ]; then
+        echo -e "${RED_PREFIX}${service_names[$i]} build failed ${COLOR_SUFFIX}\n"
+        exit -1
+        else
+         echo -e "${GREEN_PREFIX}${service_names[$i]} successfully be built ${COLOR_SUFFIX}\n"
+  fi
+
+
 done
 echo -e ${YELLOW_PREFIX}"all services build success"${COLOR_SUFFIX}

script/docker_start_all.sh

@@ -9,14 +9,20 @@ need_to_start_server_shell=(
   push_start.sh
   msg_transfer_start.sh
   sdk_svr_start.sh
-  timer_start.sh
   demo_svr_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
-
+time=`date +"%Y-%m-%d %H:%M:%S"`
+echo "==========================================================">>../logs/openIM.log 2>&1 &
+echo "==========================================================">>../logs/openIM.log 2>&1 &
+echo "==========================================================">>../logs/openIM.log 2>&1 &
+echo "==========server start time:${time}===========">>../logs/openIM.log 2>&1 &
+echo "==========================================================">>../logs/openIM.log 2>&1 &
+echo "==========================================================">>../logs/openIM.log 2>&1 &
+echo "==========================================================">>../logs/openIM.log 2>&1 &
 for i in ${need_to_start_server_shell[*]}; do
   chmod +x $i
   ./$i

script/env_check.sh

@@ -1,12 +1,36 @@
 #!/usr/bin/env bash
 source ./style_info.cfg
-echo -e "check environment......................................."
 
+echo -e "check login user........................................"
+user=`whoami`
+if [ $user == "root" ] ; then
+        echo -e ${GREEN_PREFIX} "ok: login user is root" ${COLOR_SUFFIX}
+else
+        echo -e ${RED_PREFIX}"Warning: The current user is not root "${COLOR_SUFFIX}
+fi
+
+
+
+echo -e "check docker............................................"
+docker_running=`systemctl status docker | grep running |  grep active | wc -l`
+
+docker_version=`docker-compose -v; docker -v`
+
+if [ $docker_running -gt 0 ]; then
+	echo -e ${GREEN_PREFIX} "ok: docker is running"   ${COLOR_SUFFIX}
+	echo -e ${GREEN_PREFIX}  $docker_version ${COLOR_SUFFIX}
+
+else
+	echo -e ${RED_PREFIX}"docker not running"${COLOR_SUFFIX}
+fi
+
+
+echo -e "check environment......................................."
 SYSTEM=`uname -s`
 if [ $SYSTEM != "Linux" ] ; then
         echo -e ${RED_PREFIX}"Warning: Currently only Linux is supported"${COLOR_SUFFIX}
 else
-        echo -e ${GREEN_PREFIX} "Linux system is ok"${COLOR_SUFFIX}
+        echo -e ${GREEN_PREFIX} "ok: system is linux"${COLOR_SUFFIX}
 fi
 
 echo -e "check memory............................................"
@@ -15,5 +39,5 @@ if [ $available -lt 2000 ] ; then
         echo -e ${RED_PREFIX}"Warning: Your memory not enough, available is: " "$available"m${COLOR_SUFFIX}"\c"
         echo -e ${RED_PREFIX}", must be greater than 2000m"${COLOR_SUFFIX}
 else
-        echo -e ${GREEN_PREFIX} "Memory is ok, available is: "$available"m${COLOR_SUFFIX}"
+        echo -e ${GREEN_PREFIX} "ok: available memory is: "$available"m${COLOR_SUFFIX}"
 fi

script/msg_gateway_start.sh

@@ -14,7 +14,7 @@ ws_ports=($ports_array)
 if [ ${#rpc_ports[@]} -ne ${#ws_ports[@]} ]; then
 
   echo -e ${RED_PREFIX}"ws_ports does not match push_rpc_ports in quantity!!!"${COLOR_SUFFIX}
-  exit 0
+  exit -1
 
 fi
 #Check if the service exists

script/start_all.sh

@@ -11,8 +11,19 @@ need_to_start_server_shell=(
   sdk_svr_start.sh
   demo_svr_start.sh
 )
+time=`date +"%Y-%m-%d %H:%M:%S"`
+echo "==========================================================">>../logs/openIM.log 2>&1 &
+echo "==========================================================">>../logs/openIM.log 2>&1 &
+echo "==========================================================">>../logs/openIM.log 2>&1 &
+echo "==========server start time:${time}===========">>../logs/openIM.log 2>&1 &
+echo "==========================================================">>../logs/openIM.log 2>&1 &
+echo "==========================================================">>../logs/openIM.log 2>&1 &
+echo "==========================================================">>../logs/openIM.log 2>&1 &
 
 for i in ${need_to_start_server_shell[*]}; do
   chmod +x $i
   ./$i
+    if [ $? -ne 0 ]; then
+        exit -1
+  fi
 done

script/start_rpc_service.sh

@@ -45,24 +45,23 @@ for ((i = 0; i < ${#service_filename[*]}; i++)); do
 
   if [ $(eval ${count}) -gt 0 ]; then
     pid="${service_name}| awk '{print \$2}'"
-    echo -e "${SKY_BLUE_PREFIX}${service_filename[$i]} service has been started,pid:$(eval $pid)$COLOR_SUFFIX"
-    echo -e "${SKY_BLUE_PREFIX}Killing the service ${service_filename[$i]} pid:$(eval $pid)${COLOR_SUFFIX}"
+    echo  "${service_filename[$i]} service has been started,pid:$(eval $pid)"
+    echo  "killing the service ${service_filename[$i]} pid:$(eval $pid)"
     #kill the service that existed
     kill -9 $(eval $pid)
     sleep 0.5
   fi
-  cd ../bin && echo -e "${SKY_BLUE_PREFIX}${service_filename[$i]} service is starting${COLOR_SUFFIX}"
+  cd ../bin
   #Get the rpc port in the configuration file
   portList=$(cat $config_path | grep ${service_port_name[$i]} | awk -F '[:]' '{print $NF}')
   list_to_string ${portList}
   #Start related rpc services based on the number of ports
   for j in ${ports_array}; do
-    echo -e "${SKY_BLUE_PREFIX}${service_filename[$i]} Service is starting,port number:$j $COLOR_SUFFIX"
     #Start the service in the background
     #    ./${service_filename[$i]} -port $j &
     nohup ./${service_filename[$i]} -port $j >>../logs/openIM.log 2>&1 &
     sleep 1
     pid="netstat -ntlp|grep $j |awk '{printf \$7}'|cut -d/ -f1"
-    echo -e "${RED_PREFIX}${service_filename[$i]} Service is started,port number:$j pid:$(eval $pid)$COLOR_SUFFIX"
+    echo -e "${GREEN_PREFIX}${service_filename[$i]} start success,port number:$j pid:$(eval $pid)$COLOR_SUFFIX"
   done
 done