Merge branch 'master' of http://git.quantgroup.cn/QA/qa-deploy-utils

qa_shell_script/base_script/restartJava.sh

@@ -34,11 +34,10 @@ function ack()
         fail_flag=`grep -E "APPLICATION FAILED TO START|Application startup failed" ${log_path} | wc -l`
         if [ "${fail_flag}" = 1 ];then
             echo "server $ip $project startup failed in ${wait_ack_time} seconds..."
-            num=`grep -n "\[ERROR\]" $log_path | head -1 |cut -d ":" -f 1`
+            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 启动日志错误信息截取如下："
-                #echo "sed -n "$[$num-3],$[$num+10]p" $log_path"
-                sed -n "$[$num-2],$[$num+10]p" $log_path
+                sed -n "$[$num],$[$num+10]p" $log_path
             fi
             exit -1
         fi
@@ -56,11 +55,10 @@ function ack()
         else
             echo "server $ip $project not startup in ${max_wait_ack_time} seconds..."
             #echo "num=`grep -n \"\[ERROR\]\" $log_path | head -1 |cut -d ":" -f 1`"
-            num=`grep -n "\[ERROR\]" $log_path | head -1 |cut -d ":" -f 1`
+            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 启动日志错误信息截取如下："
-                #echo "sed -n "$[$num-3],$[$num+10]p" $log_path"
-                sed -n "$[$num-2],$[$num+10]p" $log_path
+                sed -n "$[$num],$[$num+10]p" $log_path
             fi
             exit -1
         fi
@@ -79,7 +77,7 @@ cd $project_path/$project
 P_UUID=`ps -ef|grep ${project}.jar |grep -v 'grep'|awk '{print $2}'`
 if [ -n "${P_UUID}" ];then
     echo "Kill $project PPID=${P_UUID}"
-	kill -9 ${P_UUID}
+    kill ${P_UUID}
     sleep 2s
 fi