From 14228b503a8eaf306dfcb702af580d38f4bf5000 Mon Sep 17 00:00:00 2001
From: away <1819625428@qq.com>
Date: Thu, 15 Jul 2021 11:00:07 +0800
Subject: [PATCH] script update

---
 script/msg_transfer_start.sh | 41 ++++++++++++++++--------------------
 script/push_start.sh         |  3 ---
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/script/msg_transfer_start.sh b/script/msg_transfer_start.sh
index 1ccc9abc0..554e46ec1 100644
--- a/script/msg_transfer_start.sh
+++ b/script/msg_transfer_start.sh
@@ -3,36 +3,31 @@
 source ./style_info.cfg
 source ./path_info.cfg
 
-
-
 #Check if the service exists
 #If it is exists,kill this process
-check=`ps aux | grep -w ./${msg_transfer_name} | grep -v grep| wc -l`
-if [ $check -eq 1 ]
-then
-oldPid=`ps aux | grep -w ./${msg_transfer_name} | grep -v grep|awk '{print $2}'`
- kill -9 $oldPid
+check=$(ps aux | grep -w ./${msg_transfer_name} | grep -v grep | wc -l)
+if [ $check -eq 1 ]; then
+  oldPid=$(ps aux | grep -w ./${msg_transfer_name} | grep -v grep | awk '{print $2}')
+  kill -9 $oldPid
 fi
 #Waiting port recycling
 sleep 1
 cd ${msg_transfer_binary_root}
-    nohup ./${msg_transfer_name}  >>../logs/${msg_transfer_name}.log 2>&1 &
+nohup ./${msg_transfer_name} >>../logs/${msg_transfer_name}.log 2>&1 &
 #Check launched service process
-check=`ps aux | grep -w ./${msg_transfer_name} | grep -v grep| wc -l`
-if [ $check -eq 1 ]
-then
-newPid=`ps aux | grep -w ./${msg_transfer_name} | grep -v grep|awk '{print $2}'`
-ports=`netstat -netulp | grep ${newPid}|awk '{print $4}'|awk -F '[:]' '{print $NF}'`
-allPorts=""
+check=$(ps aux | grep -w ./${msg_transfer_name} | grep -v grep | wc -l)
+if [ $check -eq 1 ]; then
+  newPid=$(ps aux | grep -w ./${msg_transfer_name} | grep -v grep | awk '{print $2}')
+  ports=$(netstat -netulp | grep ${newPid} | awk '{print $4}' | awk -F '[:]' '{print $NF}')
+  allPorts=""
 
-for i in $ports ;
-do
-     allPorts=${allPorts}"$i "
-done
-    echo -e ${SKY_BLUE_PREFIX}"SERVICE START SUCCESS !!!"${COLOR_SUFFIX}
-    echo -e ${SKY_BLUE_PREFIX}"SERVICE_NAME: "${COLOR_SUFFIX}${YELLOW_PREFIX}${msg_transfer_name}${COLOR_SUFFIX}
-    echo -e ${SKY_BLUE_PREFIX}"PID: "${COLOR_SUFFIX}${YELLOW_PREFIX}${newPid}${COLOR_SUFFIX}
-    echo -e ${SKY_BLUE_PREFIX}"LISTENING_PORT: "${COLOR_SUFFIX}${YELLOW_PREFIX}${allPorts}${COLOR_SUFFIX}
+  for i in $ports; do
+    allPorts=${allPorts}"$i "
+  done
+  echo -e ${SKY_BLUE_PREFIX}"SERVICE START SUCCESS !!!"${COLOR_SUFFIX}
+  echo -e ${SKY_BLUE_PREFIX}"SERVICE_NAME: "${COLOR_SUFFIX}${YELLOW_PREFIX}${msg_transfer_name}${COLOR_SUFFIX}
+  echo -e ${SKY_BLUE_PREFIX}"PID: "${COLOR_SUFFIX}${YELLOW_PREFIX}${newPid}${COLOR_SUFFIX}
+  echo -e ${SKY_BLUE_PREFIX}"LISTENING_PORT: "${COLOR_SUFFIX}${YELLOW_PREFIX}${allPorts}${COLOR_SUFFIX}
 else
-    echo -e ${YELLOW_PREFIX}${msg_transfer_name}${COLOR_SUFFIX}${RED_PREFIX}"SERVICE START ERROR !!! PLEASE CHECK ERROR LOG"${COLOR_SUFFIX}
+  echo -e ${YELLOW_PREFIX}${msg_transfer_name}${COLOR_SUFFIX}${RED_PREFIX}"SERVICE START ERROR !!! PLEASE CHECK ERROR LOG"${COLOR_SUFFIX}
 fi
diff --git a/script/push_start.sh b/script/push_start.sh
index 5bc71c271..61754b206 100644
--- a/script/push_start.sh
+++ b/script/push_start.sh
@@ -4,8 +4,6 @@ source ./style_info.cfg
 source ./path_info.cfg
 source ./function.sh
 
-
-
 list1=$(cat $config_path | grep openImPushPort | awk -F '[:]' '{print $NF}')
 list_to_string $list1
 rpc_ports=($ports_array)
@@ -25,7 +23,6 @@ for ((i = 0; i < ${#rpc_ports[@]}; i++)); do
   nohup ./${push_name} -port ${rpc_ports[$i]} >>../logs/${push_name}.log 2>&1 &
 done
 
-
 #Check launched service process
 check=$(ps aux | grep -w ./${push_name} | grep -v grep | wc -l)
 if [ $check -eq 1 ]; then