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

init_container/sync-job-status/run.py

@@ -4,7 +4,7 @@ import json
 import os
 
 def check():
-    url = "http://eos.quantgroups.com/api/etcd/get_env_job_status"
+    url = "http://192.168.6.13/api/etcd/get_env_job_status"
     querystring = {"namespace": os.getenv('NAMESPACE')}
 
     headers = {}

job/db-sync/docker-entrypoint.sh

@@ -9,7 +9,7 @@ db_is_running=0
 export NAMESPACE=`cat /var/run/secrets/kubernetes.io/serviceaccount/namespace`
 
 curl --request POST \
-  --url http://eos.quantgroups.com/api/etcd/set_env_job_status \
+  --url http://192.168.6.13/api/etcd/set_env_job_status \
   --header 'Content-Type: application/json' \
   --data "{\"namespace\": \"$NAMESPACE\",\"job_name\": \"db_sync\",\"status\": \"pending\"}"
 
@@ -110,6 +110,6 @@ do
 done
 
 curl --request POST \
-  --url http://eos.quantgroups.com/api/etcd/set_env_job_status \
+  --url http://192.168.6.13/api/etcd/set_env_job_status \
   --header 'Content-Type: application/json' \
   --data "{\"namespace\": \"$NAMESPACE\",\"job_name\": \"db_sync\",\"status\": \"done\"}"

job/rabbitmq-sync/docker-entrypoint.sh

@@ -6,7 +6,7 @@ is_running=0
 export NAMESPACE=`cat /var/run/secrets/kubernetes.io/serviceaccount/namespace`
 
 curl --request POST \
-  --url http://eos.quantgroups.com/api/etcd/set_env_job_status \
+  --url http://192.168.6.13/api/etcd/set_env_job_status \
   --header 'Content-Type: application/json' \
   --data "{\"namespace\": \"$NAMESPACE\",\"job_name\": \"rabbitmq_sync\",\"status\": \"pending\"}"
 
@@ -41,6 +41,6 @@ if [[ $is_running -eq 1 ]]
 fi
 
 curl --request POST \
-  --url http://eos.quantgroups.com/api/etcd/set_env_job_status \
+  --url http://192.168.6.13/api/etcd/set_env_job_status \
   --header 'Content-Type: application/json' \
   --data "{\"namespace\": \"$NAMESPACE\",\"job_name\": \"rabbitmq_sync\",\"status\": \"done\"}"
\ No newline at end of file

templates/java/docker-entrypoint.sh

@@ -15,29 +15,35 @@ 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} &
+	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} >/dev/null 2>&1 &
 else
 	echo "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} & " > java_command
-	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} &
+	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} >/dev/null 2>&1 &
 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,8 @@ 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
\ No newline at end of file
+echo "frontail ./logs/*log -n 500 -d "
+frontail ./logs/*log -n 500 -d 
+
+echo "tail -f ./logs/*log"
+tail -f ./logs/*log
\ No newline at end of file