update run.sh

dev/java/run.sh

@@ -7,12 +7,9 @@ log_path="/home/quant_group/logs"
 export NAMESPACE=`cat /var/run/secrets/kubernetes.io/serviceaccount/namespace`
 echo "NAMESPACE is $NAMESPACE"
 
-echo "clean ${log_path}/*"
-rm -rf ${log_path}/*
-
 if [[ $CLUSTER == "3B" ]]; then	
-	echo "java -Xmx512m -Xloggc:/tmp/${module_name}_gc.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -Denv=pro -Didc=k8s3b -jar ${package_path} --worker 1 --currentWorker 1 -t --server.port=80 --spring.config.location=${config_path} >/dev/null 2>&1" > java_command
-	nohup java -Xmx512m -Xloggc:/tmp/${module_name}_gc.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -Denv=pro -Didc=k8s3b -jar ${package_path} --worker 1 --currentWorker 1 -t --server.port=80 --spring.config.location=${config_path} >/dev/null 2>&1 &
+	echo "java -Xmx512m -Xloggc:/tmp/${module_name}_gc.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -Denv=pro -Didc=k8s3b -jar ${package_path} --worker 1 --currentWorker 1 -t --server.port=80 --spring.config.location=${config_path} > /dev/null 2>&1" > java_command
+	nohup java -Xmx512m -Xloggc:/tmp/${module_name}_gc.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -Denv=pro -Didc=k8s3b -jar ${package_path} --worker 1 --currentWorker 1 -t --server.port=80 --spring.config.location=${config_path} > /dev/null 2>&1 &
 	
 	# waiting for log
 	count=0
@@ -44,13 +41,16 @@ if [[ $CLUSTER == "3B" ]]; then
 	cd ${HOME_PATH}/filebeat/ && nohup ./filebeat filebeat.yml &
 	
 	if [[ $count -eq 60 ]] && [[ $log_exist -eq 0 ]]; then
-		touch ./logs/error.log
+		touch $log_path/error.log
 		echo "Log is not exist or java server start error." >> ./logs/error.log 
 	fi
 	
 	echo "tail -f $log_path/*log"
 	tail -f $log_path/*log
 else
+	echo "clean ${log_path}/*"
+	rm -rf ${log_path}/*
+
         echo "kill java process"
         kill -9 $(ps -ef |grep '/home/quant_group/project/app.jar' | grep -v 'grep' | awk '{ print $2 }')
 	echo 192.168.3.11 ldap.quantgroups.com >> /etc/hosts
@@ -64,7 +64,7 @@ else
 	sed -i "s#xterm.js demo#${SYSTEM_NAME}@${NAMESPACE}#"  /home/qg-xterm/demo/index.html
 	
 	echo "java -Xmx512m  -Xloggc:/tmp/${module_name}_gc.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -Denv=dev -Didc=k8s -Dtest=true -jar ${package_path} --worker 1 --currentWorker 1 -t --server.port=80 --spring.config.location=${config_path} & " > java_command
-	nohup java -Xmx512m -Xloggc:/tmp/${module_name}_gc.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 -Denv=dev -Didc=k8s -Dtest=true -jar ${package_path} --worker 1 --currentWorker 1 -t --server.port=80 --spring.config.location=${config_path} >/dev/null 2>&1 &
+	nohup java -Xmx512m -Xloggc:/tmp/${module_name}_gc.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 -Denv=dev -Didc=k8s -Dtest=true -jar ${package_path} --worker 1 --currentWorker 1 -t --server.port=80 --spring.config.location=${config_path} > /dev/null 2>&1 &
 	
 	# waiting for log
 	count=0