up

qa_shell_script/base_script/restartJava.sh

@@ -31,14 +31,11 @@ function ack()
     for ((i=0;;))
     do
         #首先查询是否有启动失败的报错日志
-        fail_flag=`grep -E "APPLICATION FAILED TO START|Application startup failed" ${log_path} | wc -l`
-        if [ "${fail_flag}" = 1 ];then
+        num=`grep -n -E "APPLICATION FAILED TO START|Application startup failed" $log_path | cut -d ":" -f 1`
+        if [ -n "${num}" ];then
             echo "server $ip $project startup failed in ${wait_ack_time} seconds..."
-            num=`grep -n -E "APPLICATION FAILED TO START|Application startup failed" $log_path | cut -d ":" -f 1`
-            if [ -n "$num" ];then
-                echo "server $ip $project 启动日志错误信息截取如下："
-                sed -n "$[$num],$[$num+10]p" $log_path
-            fi
+            echo "server $ip $project 启动日志错误信息截取如下："
+            sed -n "$[$num],$[$num+10]p" $log_path
             exit -1
         fi