java

dev/java/run.sh

@@ -12,15 +12,14 @@ echo "add /etc/hosts"
 echo 192.168.3.2 ldap.quantgroups.com >> /etc/hosts
 echo 192.168.6.13 eos.quantgroups.com >> /etc/hosts
 echo 192.168.4.117 apollo-dev.quantgroups.com >> /etc/hosts
-source ~/.bash_profile
 
-echo "sed qa domian, from xyqb.com to q-gp.com"
+echo "sed domian, from xyqb.com to q-gp.com"
 sed -i "s#.xyqb.com#-$NAMESPACE.q-gp.com#g" ${config_path}
 sed -i "s#.domain.com#-$NAMESPACE.q-gp.com#g" ${config_path}
 sed -i "s#.quantgroup.cn#-$NAMESPACE.q-gp.com#g" ${config_path}
 sed -i "s#xterm.js demo#${SYSTEM_NAME}@${NAMESPACE}#"  /home/qg-xterm/demo/index.html
 
-echo "clean log dir"
+echo "clean ${log_path}/*"
 rm -rf ${log_path}/*
 
 if [[ $CLUSTER == "3B" ]]; then	
@@ -34,7 +33,7 @@ if [[ $CLUSTER == "3B" ]]; then
 	until [[ $count -eq 60 ]] || [[ $log_exist -eq 1 ]]
 	do
 	  let count+=1
-	  echo "count is $count"
+	  echo "waiting for log in $log_path ... $count"
   
 	  if find "$log_path" -mindepth 1 -print -quit | grep -q .; then
 	      echo "log is exist!"
@@ -57,12 +56,11 @@ else
 	# waiting for log
 	count=0
 	log_exist=0
-	log_path="/home/quant_group/logs"
 
 	until [[ $count -eq 60 ]] || [[ $log_exist -eq 1 ]]
 	do
 	  let count+=1
-	  echo "count is $count"
+	  echo "waiting for log in $log_path ... $count"
   
 	  if find "$log_path" -mindepth 1 -print -quit | grep -q .; then
 	      echo "log is exist!"
@@ -75,7 +73,9 @@ else
 		touch ./logs/error.log
 		echo "Log is not exist or java server start error." >> ./logs/error.log 
 	fi
-
+	
+	source ~/.bash_profile
+	
 	echo "cd /home/qg-xterm/;git pull;cd -"
 	cd /home/qg-xterm/;git pull;cd -