更新java构建script

templates/java/docker-entrypoint.sh

@@ -15,10 +15,10 @@ sed -i "s#xterm.js demo#${SYSTEM_NAME}@${NAMESPACE}#"  /home/qg-xterm/demo/index
 
 if [[ $CLUSTER == "pro" ]]; then
 	#初始化变量
-	export db="192.168.4.72"
-	#export rabbitmq=“192.168.4.72”
-	#export redis="192.168.4.72"
-	#export zookeeper="192.168.4.72"
+	export DB_SERVICE_HOST="192.168.4.15"
+	export RABBIT_SERVICE_HOST="192.168.4.15"
+	export REDIS_SERVICE_HOST="192.168.4.15"
+	export ZOOKEEPER_SERVICE_HOST="192.168.4.15"
 	
 	echo "nohup java -Xmx512m  -Xloggc:/tmp/${module_name}_gc.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -Denv=pro -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 -Denv=pro -Didc=k8s -Dtest=true -jar ${package_path} --worker 1 --currentWorker 1 -t --server.port=80 --spring.config.location=${config_path} &
@@ -27,17 +27,23 @@ else
 	nohup 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} &
 fi
 
-
-echo "sleep 10"
-sleep 10
-
-if ls ./*log 1> /dev/null 2>&1; then
-    echo "ls -l ./logs"
-    ls -l ./logs    
-else
-    echo "files do not exist"
-    touch ./logs/tmp.log
-fi
+# 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
+  else
+      echo "log is not exist! waiting for server start."
+  fi
+  sleep 1
+done
 
 echo "cd /home/qg-xterm/;git pull;cd -"
 cd /home/qg-xterm/;git pull;cd -
@@ -45,5 +51,5 @@ cd /home/qg-xterm/;git pull;cd -
 echo "node /home/qg-xterm/demo/app.js"
 nohup node /home/qg-xterm/demo/app.js &
 
-echo "frontail logs/*.log -d -n 300"
-frontail ./logs/*log -n 300
+echo "./logs/*log | frontail -"
+tail -f ./logs/*log | frontail -
\ No newline at end of file