Merge branch 'master' of http://gitabc.xyqb.com/QA/qa-deploy-utils

qa_shell_script/5_restart_by_name.sh

@@ -19,6 +19,7 @@ function restartJavaProject()
 	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`
 	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}'`
@@ -47,23 +48,24 @@ function restartJavaProject()
 		fi
 	fi
 	
-	echo "-----project:$project while be run command: java -Xmx256m -XX:PermSize64m -Xloggc:/tmp/${project}.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps  -jar ${project}.jar --worker 1 --currentWorker 1 -t > /dev/null 2>&1 &"
+	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
+        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
-	# 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 &`
-	
-	#sleep 30s
+
+
 	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"
+			echo "Fail to start"
 	fi
 }
 

qa_shell_script/5_restart_by_type.sh

@@ -22,6 +22,7 @@ function restartJavaProject()
 	for project in ${projects[@]}
 	do
 		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`
 		sh $config_server/show_info.sh $project 重新启动 $desc $1
 		cd $project_path/$project
 		P_UUID=`ps -ef|grep ${project}.jar |grep -v 'grep'|awk '{print $2}'`
@@ -48,14 +49,8 @@ function restartJavaProject()
 			fi
 		fi
 		
-		echo "-----project:$project while be run command: java -Xmx256m -XX:PermSize64m -Xloggc:/tmp/${project}.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps  -jar ${project}.jar --worker 1 --currentWorker 1 -t > /dev/null 2>&1 &"
-		#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 &`
-         	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
-
+		echo "$run_command"
+		echo `$run_command`
 		sleep 10s
 		#ack "$ack_phrase" $project_path/logs/$log_name ${max_wait_log_generate_time} ${max_wait_ack_time}
 

qa_shell_script/config_server/get_env_ip.sh

-12 13 14 15 16 17 22 23 24 25 26 28 50  72 151 152 153 154 155 156 158 160 161 162 163 164
+12 13 14 15 16 17 22 23 24 25 26 28 46 50  72 151 152 153 154 155 156 158 160 161 162 163 164

qa_shell_script/exception_sub_shell.sh

@@ -117,7 +117,7 @@ tranceConfig java "xyqb.is.debug=0" "xyqb.is.debug=1" "192.168.4.23" "baitiao.pr
 
 #4.24
 #tranceConfig java "sms.is.debug=1" "sms.is.debug=0" "192.168.4.24" "di-ting.properties"
-tranceConfig java "xyqb.is.debug=1" "xyqb.is.debug=0" "192.168.4.24" "xyqb.properties"
+#tranceConfig java "xyqb.is.debug=1" "xyqb.is.debug=0" "192.168.4.24" "xyqb.properties"
 tranceConfig node "112233445512345.ittun.com" "activity-op-24.ss.xyqb.loan" "192.168.4.24" "activity-op.js"
 
 #4.151

qa_shell_script/migrate_ENV/20170627.sh

+#!/bin.bash
+

qa_shell_script/rabbitmq/initial_mq.sh

@@ -29,6 +29,7 @@ add_vhost /funding
 add_vhost /loan_order
 add_vhost baitiao_debt
 add_vhost financial_system
+add_vhost feature 
 add_vhost mall
 add_vhost offline
 add_vhost orderstatus_vhost
@@ -62,6 +63,7 @@ add_exchange backend backend_message_rewrite_exc direct
 add_exchange backend backend_file_exc direct
 add_exchange /funding async direct
 add_exchange spider_center feature_save direct
+add_exchange feature feature_save direct
 
 
 #add queues
@@ -115,6 +117,7 @@ add_queues baitiao_debt xyqb_baitiao_queue
 add_queues /black_hole generate_auth_success
 add_queues /black_hole waiting_auth_generate
 add_queues spider_center feature_calculate
+add_queues feature feature_calculate
 
 #add bindings
 add_binding backend backend_message_rewrite_exc backend_message_rewrite_queue backend_message_rewrite_route