From 1c4d1c7cd1b5e05a8be50c57848d16a7f79c5d5b Mon Sep 17 00:00:00 2001 From: hael Date: Thu, 9 Jan 2025 09:50:31 +0100 Subject: [PATCH] deploy application status --- scripts/scheduler/check_pid.sh | 16 ++++++++++++---- scripts/scheduler/entrypoint.sh | 3 ++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/scripts/scheduler/check_pid.sh b/scripts/scheduler/check_pid.sh index ecd1409..00d10e3 100644 --- a/scripts/scheduler/check_pid.sh +++ b/scripts/scheduler/check_pid.sh @@ -13,6 +13,11 @@ debug() { fi } +JSON_TARGET=$(echo '{ "DATE": "'$DATE'", "STATUS": "1" }' | jq -r . | base64 -w0) # deployment has started +debug "JSON_TARGET: $JSON_TARGET" + +echo $JSON_TARGET | base64 -d >$SHARED/output/$APPLICATION.json + if [ "$PID" != "" ]; then debug "BACKGROUND PID: $PID" @@ -23,11 +28,14 @@ if [ "$PID" != "" ]; then sleep 2 done + # deploy finished JSON_TARGET=$(echo '{ "DATE": "'$DATE'", "STATUS": "2" }' | jq -r . | base64 -w0) - debug "JSON_TARGET: $JSON_TARGET" - - echo $JSON_TARGET | base64 -d >$SHARED/output/$APPLICATION.json - #redis-cli -h $REDIS_SERVER -p $REDIS_PORT SET $APPLICATION "$JSON_TARGET" +else # error, no PID + JSON_TARGET=$(echo '{ "DATE": "'$DATE'", "STATUS": "0" }' | jq -r . | base64 -w0) fi; +debug "JSON_TARGET: $JSON_TARGET" +echo $JSON_TARGET | base64 -d >$SHARED/output/$APPLICATION.json +#redis-cli -h $REDIS_SERVER -p $REDIS_PORT SET $APPLICATION "$JSON_TARGET" + diff --git a/scripts/scheduler/entrypoint.sh b/scripts/scheduler/entrypoint.sh index 1ba968b..7e18bea 100644 --- a/scripts/scheduler/entrypoint.sh +++ b/scripts/scheduler/entrypoint.sh @@ -736,7 +736,8 @@ execute_task() { TEMPLATE=$(echo "$TEMPLATE" | base64 -w0) JSON_TARGET=$(echo '{ "DATE": "'$DATE'", "STATUS": "0", "TEMPLATE": "'$TEMPLATE'" }' | jq -r . | base64 -w0) elif [ "$DEPLOY_ACTION" == "deploy" ]; then - JSON_TARGET=$(echo '{ "DATE": "'$DATE'", "STATUS": "1" }' | jq -r . | base64 -w0) # deployment has started + JSON_TARGET="" + #JSON_TARGET=$(echo '{ "DATE": "'$DATE'", "STATUS": "1" }' | jq -r . | base64 -w0) # deployment has started #redis-cli -h $REDIS_SERVER -p $REDIS_PORT SET "$DEPLOY_ACTION-$DEPLOY_NAME" "$JSON_TARGET" # web_in DEPLOY_PAYLOAD=$(echo "$JSON" | jq -r .PAYLOAD) # base64 list of key-value pairs in JSON