safebox/framework-scheduler
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 16 Wiki Activity

Refactor deployment logic to stop service before editing in entrypoint script
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/tag Build is passing
Details

Browse Source
This commit is contained in:
gyurix
2025-05-29 12:14:02 +02:00
parent ba8af23f42
commit 2c782808ed
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/scheduler/entrypoint.sh
View File

@@ -116,7 +116,6 @@ deploy_additionals() {
local DIR="$1" local DIR="$1"
local NAME="$2" local NAME="$2"
local JSON="$(echo "$3" | base64 -d)" local JSON="$(echo "$3" | base64 -d)"
local ACTION="$4"
debug "DEPLOY: $NAME" debug "DEPLOY: $NAME"
debug "JSON: $JSON" debug "JSON: $JSON"
@@ -148,11 +147,6 @@ deploy_additionals() {
done done
# start service # start service
if [ "$ACTION" == "edit" ]; then
debug "$service_exec service-$NAME.json stop force"
$service_exec service-$NAME.json stop force
fi
debug "$service_exec service-$NAME.json start info" debug "$service_exec service-$NAME.json start info"
$service_exec service-$NAME.json start info & $service_exec service-$NAME.json start info &
PID=$! PID=$!
@@ -909,6 +903,11 @@ execute_task() {
elif [ "$DEPLOY_ACTION" == "edit" ]; then elif [ "$DEPLOY_ACTION" == "edit" ]; then
DEPLOY_PAYLOAD=$(echo "$JSON" | jq -r .PAYLOAD) # base64 list of key-value pairs in JSON DEPLOY_PAYLOAD=$(echo "$JSON" | jq -r .PAYLOAD) # base64 list of key-value pairs in JSON
# stop service before edit
debug "$service_exec service-$DEPLOY_NAME.json stop force"
$service_exec service-$DEPLOY_NAME.json stop force
deploy_additionals "$APP_DIR" "$DEPLOY_NAME" "$DEPLOY_PAYLOAD" deploy_additionals "$APP_DIR" "$DEPLOY_NAME" "$DEPLOY_PAYLOAD"
sh /scripts/check_pid.sh "$PID" "$SHARED" "deploy-$DEPLOY_NAME" "$DATE" "$DEBUG" & sh /scripts/check_pid.sh "$PID" "$SHARED" "deploy-$DEPLOY_NAME" "$DATE" "$DEBUG" &