[*] 优化脚本

taoyao-signal-server/docs/bin/wait.sh

@@ -1,37 +1,40 @@
 #!/bin/bash
 
-# 休眠一秒：等待后台任务调度
-sleep 1
+#########################
+#        等待任务        #
+#########################
 
-# 等待任务
-startTime=$(date +%s)
-processId=$(ps -aux | grep "${project.artifactId}" | grep java | awk '{print $2}')
-processPortNumber=0
+# 休眠一秒：等待后台任务调度
+sleep 2
+aTime=$(date +%s)
+processCt=0
+processId=$(ps -aux | grep "${project.artifactId}" | grep java | awk "{print $2}")
 if [ ! -z "$processId" ]; then
+  echo "等待应用：${project.artifactId}-${project.version} - $processId"
   waitIndex=0
-  processPortNumber=$(netstat -anop | grep $processId | grep LISTEN | wc -l)
-  while [ $waitIndex -le 120 ] && [ ! -z "$processId" ] && [ $processPortNumber -lt 1 ]
+  processCt=$(netstat -anop | grep $processId | grep LISTEN | wc -l)
+  while [ ! -z "$processId" ] && [ $processCt -lt 1 ] && [ $waitIndex -le 120 ]
   do
     sleep 1
     waitIndex=$((waitIndex+1))
-    processId=$(ps -aux | grep "${project.artifactId}" | grep java | awk '{print $2}')
+    processId=$(ps -aux | grep "${project.artifactId}" | grep java | awk "{print $2}")
     if [ ! -z "$processId" ]; then
-      processPortNumber=$(netstat -anop | grep $processId | grep LISTEN | wc -l)
+      processCt=$(netstat -anop | grep $processId | grep LISTEN | wc -l)
     else
-      processPortNumber=0
+      processCt=0
     fi
     echo -n "."
   done
   echo ""
 fi
-if [ $processPortNumber -lt 1 ]; then
-  echo -e "\033[31m启动失败：${project.artifactId}-${project.version}\033[0m"
+if [ $processCt -lt 1 ]; then
+  echo -e "\033[31m启动失败：${project.artifactId}-${project.version} - $processId\033[0m"
   bash bin/stop.sh
   exit 0
 else
-  finishTime=$(date +%s)
-  processTime=$((finishTime-startTime))
+  zTime=$(date +%s)
+  cTime=$((finishTime-aTime))
   echo -e "\033[32m启动成功：${project.artifactId}-${project.version} - $processId\033[0m"
-  echo "启动端口：$(netstat -anop | grep $processId | grep LISTEN | awk '{print $4}')"
-  echo "启动耗时：$processTime S"
+  echo "启动端口：$(netstat -anop | grep $processId | grep LISTEN | awk "{print $4}")"
+  echo "启动耗时：$cTime S"
 fi