diff --git a/script/docker_start_all.sh b/script/docker_start_all.sh index 99887bff9..42ee81992 100644 --- a/script/docker_start_all.sh +++ b/script/docker_start_all.sh @@ -15,7 +15,14 @@ need_to_start_server_shell=( #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 diff --git a/script/msg_gateway_start.sh b/script/msg_gateway_start.sh index 978cc11fb..7c107f16a 100644 --- a/script/msg_gateway_start.sh +++ b/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 diff --git a/script/start_all.sh b/script/start_all.sh index 4125ca50a..bf7170d68 100644 --- a/script/start_all.sh +++ b/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 diff --git a/script/start_rpc_service.sh b/script/start_rpc_service.sh index 0b54493c2..e15307f45 100644 --- a/script/start_rpc_service.sh +++ b/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 \ No newline at end of file