更新job

job/db-sync/docker-entrypoint.sh

@@ -11,7 +11,7 @@ export NAMESPACE=`cat /var/run/secrets/kubernetes.io/serviceaccount/namespace`
 curl --request POST \
   --url http://192.168.29.116:9001/api/etcd/set_env_job_status \
   --header 'Content-Type: application/json' \
-  --data "{\"namespace\": \"$NAMESPACE\",\"job_name\": \"rabbitmq_sync\",\"status\": \"pending\"}"
+  --data "{\"namespace\": \"$NAMESPACE\",\"job_name\": \"db_sync\",\"status\": \"pending\"}"
 
 until [[ $count -eq 300 ]] || [[ $db_is_running -eq 1 ]]
 do
@@ -32,11 +32,6 @@ if [[ $db_is_running -eq 1 ]]
   then
     echo "db is running!!! start execution sync job"
 	
-	curl --request POST \
-	  --url http://192.168.29.116:9001/api/etcd/set_env_job_status \
-	  --header 'Content-Type: application/json' \
-	  --data "{\"namespace\": \"$NAMESPACE\",\"job_name\": \"rabbitmq_sync\",\"status\": \"running\"}"
-	
     echo "start replace db domain"
     DB_FILE=dump.sql
     HOST=$DB_SERVICE_HOST
@@ -108,12 +103,13 @@ do
   if [ $? -eq 0 ]
     then
 		db_is_running=1
-		curl --request POST \
-		  --url http://192.168.29.116:9001/api/etcd/set_env_job_status \
-		  --header 'Content-Type: application/json' \
-		  --data "{\"namespace\": \"$NAMESPACE\",\"job_name\": \"rabbitmq_sync\",\"status\": \"done\"}"
     else
       echo "db is not running"
       sleep 1
   fi
 done
+
+curl --request POST \
+  --url http://192.168.29.116:9001/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

@@ -3,6 +3,14 @@
 count=1
 is_running=0
 
+export NAMESPACE=`cat /var/run/secrets/kubernetes.io/serviceaccount/namespace`
+
+curl --request POST \
+  --url http://192.168.29.116:9001/api/etcd/set_env_job_status \
+  --header 'Content-Type: application/json' \
+  --data "{\"namespace\": \"$NAMESPACE\",\"job_name\": \"rabbitmq_sync\",\"status\": \"pending\"}"
+
+
 until [[ $count -eq 300 ]] || [[ $is_running -eq 1 ]]
 do
   let count+=1
@@ -27,4 +35,9 @@ if [[ $is_running -eq 1 ]]
 	curl -X POST -H "Content-Type: application/json" -H "Authorization: Basic cWE6cWF0ZXN0" -d $response "http://rabbitmq:15672/api/definitions"
   else
     echo "rabbitmq is not running!!! Do not execution sync job"
-fi
\ No newline at end of file
+fi
+
+curl --request POST \
+  --url http://192.168.29.116:9001/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