调整日志输出

templates/java/docker-entrypoint.sh

@@ -12,6 +12,11 @@ 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 "cd /home/qg-xterm/;git pull;cd -"
+cd /home/qg-xterm/;git pull;cd -
+
+echo "node /home/qg-xterm/demo/app.js"
+nohup node /home/qg-xterm/demo/app.js &
 
 if [[ $CLUSTER == "pro" ]]; then
 	#初始化变量
@@ -24,35 +29,29 @@ if [[ $CLUSTER == "pro" ]]; then
 	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} >/dev/null 2>&1 &
+	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} | frontail -n 500 -
 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 -
-
-echo "node /home/qg-xterm/demo/app.js"
-nohup node /home/qg-xterm/demo/app.js &
-
-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
+# # 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 "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