temp

qa_shell_script/5_restart_by_name.sh

@@ -12,64 +12,64 @@ node7_path=`cat $config_server/node_7_path.sh`
 profile=test
 time=`date +%Y_%m_%d_%H_%M_%S`
 
-function restartJavaProject()
-{
-	max_wait_log_generate_time=50
-	max_wait_ack_time=500
-	ack_phrase="Started\ Bootstrap"
-	project=$1
-	desc=`node $config_server/get_project_config.js  -name $project -attr desc`
-	run_command_=`node $config_server/get_project_config.js  -name $project -attr command`
-	run_command=${run_command_//\^/ }
-	sh $config_server/show_info.sh $project 重新启动 $desc $2
-	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}"
-		echo `kill -9 ${P_UUID}`
-		sleep 2s
-	fi
-
-	config_file=`find ./ -maxdepth 2 -name "application.properties"`
-
-	if [ -n "$config_file" ]
-	then
-		echo "have"
-	else
-		echo "no have"
-		if $is_public_ip && [ -n "$is_public_ip" ]
-		then
-			rm -rf /home/quant_group/${project}/application.properties
-			echo "ln -s $config_path/public/java/${project}.* /home/quant_group/${project}/application.properties"
-			ln -s $config_path/public/java/${project}.* /home/quant_group/${project}/application.properties
-		else
-			rm -rf /home/quant_group/${project}/application.properties
-			echo "ln -s $config_path/java/${project}.* /home/quant_group/${project}/application.properties"
-			ln -s $config_path/java/${project}.* /home/quant_group/${project}/application.properties
-		fi
-	fi
-	
-	echo "-----project:$project while be start"
-	log_name=`node $config_server/get_project_config.js  -name $project -attr log_name`
-	
-	mv $project_path/logs/$log_name $project_path/logs/$project.log.$time
-	
-	echo "$run_command"
-
-	if  [[ $project == "redpacket" ]]; then
-		echo `java -Xmx512m -XX:PermSize64m -Xloggc:/tmp/${project}.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps  -jar ${project}.jar --worker 1 --currentWorker 1 -t -ts > /dev/null 2>&1 &`
-        else
-		echo `java -Xmx512m -XX:PermSize64m -Xloggc:/tmp/${project}.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps  -jar ${project}.jar --worker 1 --currentWorker 1 -t > /dev/null 2>&1 &`
-	fi
-
-
-	ack "$ack_phrase" $project_path/logs/$log_name ${max_wait_log_generate_time} ${max_wait_ack_time}
-	if [ $? -ne 0 ]
-	then
-		echo "Fail to start"
-		exit -1
-	fi
-}
+# function restartJavaProject()
+# {
+# 	max_wait_log_generate_time=50
+# 	max_wait_ack_time=500
+# 	ack_phrase="Started\ Bootstrap"
+# 	project=$1
+# 	desc=`node $config_server/get_project_config.js  -name $project -attr desc`
+# 	run_command_=`node $config_server/get_project_config.js  -name $project -attr command`
+# 	run_command=${run_command_//\^/ }
+# 	sh $config_server/show_info.sh $project 重新启动 $desc $2
+# 	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}"
+# 		echo `kill -9 ${P_UUID}`
+# 		sleep 2s
+# 	fi
+#
+# 	config_file=`find ./ -maxdepth 2 -name "application.properties"`
+#
+# 	if [ -n "$config_file" ]
+# 	then
+# 		echo "have"
+# 	else
+# 		echo "no have"
+# 		if $is_public_ip && [ -n "$is_public_ip" ]
+# 		then
+# 			rm -rf /home/quant_group/${project}/application.properties
+# 			echo "ln -s $config_path/public/java/${project}.* /home/quant_group/${project}/application.properties"
+# 			ln -s $config_path/public/java/${project}.* /home/quant_group/${project}/application.properties
+# 		else
+# 			rm -rf /home/quant_group/${project}/application.properties
+# 			echo "ln -s $config_path/java/${project}.* /home/quant_group/${project}/application.properties"
+# 			ln -s $config_path/java/${project}.* /home/quant_group/${project}/application.properties
+# 		fi
+# 	fi
+#
+# 	echo "-----project:$project while be start"
+# 	log_name=`node $config_server/get_project_config.js  -name $project -attr log_name`
+#
+# 	mv $project_path/logs/$log_name $project_path/logs/$project.log.$time
+#
+# 	echo "$run_command"
+#
+# 	if  [[ $project == "redpacket" ]]; then
+# 		echo `java -Xmx512m -XX:PermSize64m -Xloggc:/tmp/${project}.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps  -jar ${project}.jar --worker 1 --currentWorker 1 -t -ts > /dev/null 2>&1 &`
+#         else
+# 		echo `java -Xmx512m -XX:PermSize64m -Xloggc:/tmp/${project}.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps  -jar ${project}.jar --worker 1 --currentWorker 1 -t > /dev/null 2>&1 &`
+# 	fi
+#
+#
+# 	ack "$ack_phrase" $project_path/logs/$log_name ${max_wait_log_generate_time} ${max_wait_ack_time}
+# 	if [ $? -ne 0 ]
+# 	then
+# 		echo "Fail to start"
+# 		exit -1
+# 	fi
+# }
 
 function restartNodeProject()
 {
@@ -173,7 +173,8 @@ function ack()
 }
 
 if [ "$project_type" = "java" ]; then
-	restartJavaProject $project_name $3
+	sh $pwd_path/base_script/restartJava.sh $project_name $config_server $project_path
+	# restartJavaProject $project_name $3
 elif [ "$project_type" = "node" ]; then
 	restartNodeProject $project_name $3
 elif [ "$project_type" = "python" ]; then

qa_shell_script/base_script/buildUi.sh

@@ -39,10 +39,10 @@ yes | cp package.json package_diff.json
 bower_json=`find ./ -maxdepth 1 -name "bower.json"`
 
 if [ -n "$bower_json" ];then
-	echo "bower install --allow-root"
+	echo "执行  bower install --allow-root"
 	bower install --allow-root
 else
-	echo "don't have bower.json"
+	echo "没有bower，不需要执行"
 fi
 
 $command