update

db-utils/db_gen_config.sh

@@ -169,7 +169,7 @@ do
 			mysqldump -u${source_db_user} -p${source_db_pwd} -h${source_db_host} -P${port} $database_name --skip-lock-tables --tables $table_name --skip-add-locks > $file_name
 		fi
 	else
-		echo "\cp -f $cache_dir/$database_name/table_name.sql $file_name"
+		echo "\cp -f $cache_dir/$database_name/$table_name.sql $file_name"
 		\cp -f $cache_dir/$database_name/$table_name.sql $file_name
 	fi
 done

qa_shell_script/base_script/restartJava.sh

@@ -32,7 +32,8 @@ function ack()
     do
         #首先查询是否有启动失败的报错日志
         fail_flag=`cat ${log_path} |grep "Application startup failed" | wc -l`
-        if [ "${fail_flag}" = 1 ];then
+        fail_flag2=`cat ${log_path} |grep "APPLICATION FAILED TO START" | wc -l`
+        if [ "${fail_flag}" = 1 ] || [ "${fail_flag2}" = 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`
             if [ -n "$num" ];then