update

qa_shell_script/5_restart_by_type.sh

@@ -26,7 +26,7 @@ function restartJavaProject()
 		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 $project PPID=${P_UUID}"
 			echo `kill -9 ${P_UUID}`
 			sleep 2s
 		fi
@@ -35,9 +35,9 @@ function restartJavaProject()
 		config_file=`find ./ -maxdepth 2 -name "application.properties"`
 		if [ -n "$config_file" ]
 		then
-			echo "have"
+			echo "already have application.properties"
 		else
-			echo "no have"
+			echo "no have application.properties"
 			if $is_public_ip && [ -n "$is_public_ip" ]
 			then
 				echo "ln -s $config_path/public/java/${project}.* /home/quant_group/${project}/application.properties"
@@ -106,7 +106,7 @@ function restartPythonProject()
 		
 		P_UUID=`ps -ef|grep port=$port |grep -v 'grep'|awk '{print $2}'`
 		if [[ "${P_UUID}" != "" ]];then
-			echo "-----KILL $project PPID=${P_UUID}"
+			echo "KILL $project PPID=${P_UUID}"
 			echo `kill -9 ${P_UUID}`
 			sleep 3
 		fi

qa_shell_script/remote_excute.sh

@@ -23,7 +23,7 @@ if [ -n "$project_name"  ] && [  -n "$branch_name" ]; then
 		 expect \"]#\"
 		 send \"cd /home/qa-deploy-utils/qa_shell_script\r\"
 		 expect \"]#\"
-		 send \"sh deploy_project_by_name.sh $project_name $branch_name $public_ip\r\"
+		 send \"sh deploy_project_by_name.sh $project_name $branch_name $public_ip $ip\r\"
 		 set timeout -1
 	   expect \"]#\"
 	   send \"exit\r\"