Merge branch 'master' of http://git.quantgroup.cn/QA/qg-dockerfiles

templates/java/docker-entrypoint.sh

@@ -20,42 +20,68 @@ sed -i "s#xterm.js demo#${SYSTEM_NAME}@${NAMESPACE}#"  /home/qg-xterm/demo/index
 
 
 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 &
+	
+	# 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"
+  
+	  if find "$log_path" -mindepth 1 -print -quit | grep -q .; then
+	      echo "log is exist!"
+		  log_exist=1
+	  fi
+	  sleep 1
+	done
+	
+	if [[ $count -eq 60 ]] && [[ $log_exist -eq 0 ]]; then
+		touch ./logs/error.log
+		echo "Log is not exist or java server start error." >> ./logs/error.log 
+	fi
+	
+	echo "tail -f ./logs/*log"
+	tail -f ./logs/*log
 else
 	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 &
-fi
+	
+	# waiting for log
+	count=0
+	log_exist=0
+	log_path="/home/quant_group/logs"
 
-# 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"
+	until [[ $count -eq 60 ]] || [[ $log_exist -eq 1 ]]
+	do
+	  let count+=1
+	  echo "count is $count"
   
-  if find "$log_path" -mindepth 1 -print -quit | grep -q .; then
-      echo "log is exist!"
-	  log_exist=1
-  fi
-  sleep 1
-done
-
-if [[ $count -eq 60 ]] && [[ $log_exist -eq 0 ]]; then
-	touch ./logs/error.log
-	echo "Log is not exist or java server start error." >> ./logs/error.log 
-fi
+	  if find "$log_path" -mindepth 1 -print -quit | grep -q .; then
+	      echo "log is exist!"
+		  log_exist=1
+	  fi
+	  sleep 1
+	done
 
-echo "cd /home/qg-xterm/;git pull;cd -"
-cd /home/qg-xterm/;git pull;cd -
+	if [[ $count -eq 60 ]] && [[ $log_exist -eq 0 ]]; then
+		touch ./logs/error.log
+		echo "Log is not exist or java server start error." >> ./logs/error.log 
+	fi
 
-echo "node /home/qg-xterm/demo/app.js"
-nohup node /home/qg-xterm/demo/app.js &
+	echo "cd /home/qg-xterm/;git pull;cd -"
+	cd /home/qg-xterm/;git pull;cd -
 
-echo "frontail ./logs/*log -n 500 -d "
-frontail ./logs/*log -n 500 -d
+	echo "node /home/qg-xterm/demo/app.js"
+	nohup node /home/qg-xterm/demo/app.js &
 
-echo "tail -f ./logs/*log"
-tail -f ./logs/*log
+	echo "frontail ./logs/*log -n 500 -d "
+	frontail ./logs/*log -n 500 -d
\ No newline at end of file
+	
+	echo "tail -f ./logs/*log"
+	tail -f ./logs/*log
+fi
\ No newline at end of file