check_pid changes
This commit is contained in:
@@ -1,10 +1,17 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
PID="$1"
|
PID="$1"
|
||||||
TASK="$2"
|
SHARED="$2"
|
||||||
DATE="$3";
|
TASK="$3"
|
||||||
REDIS_SERVER="$4"
|
DATE="$4";
|
||||||
REDIS_PORT="$5"
|
DEBUG="$5";
|
||||||
|
|
||||||
|
# writes debug message if DEBUG variable is set
|
||||||
|
debug() {
|
||||||
|
if [ $DEBUG -eq 1 ]; then
|
||||||
|
echo "DEBUG: "$1 $2 $3
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
if [ "$PID" != "" ]; then
|
if [ "$PID" != "" ]; then
|
||||||
|
|
||||||
@@ -15,7 +22,8 @@ if [ "$PID" != "" ]; then
|
|||||||
JSON_TARGET=$(echo '{ "DATE": "'$DATE'", "STATUS": "2" }' | jq -r . | base64 -w0)
|
JSON_TARGET=$(echo '{ "DATE": "'$DATE'", "STATUS": "2" }' | jq -r . | base64 -w0)
|
||||||
debug "JSON_TARGET: $JSON_TARGET"
|
debug "JSON_TARGET: $JSON_TARGET"
|
||||||
|
|
||||||
redis-cli -h $REDIS_SERVER -p $REDIS_PORT SET $TASK "$JSON_TARGET"
|
echo $JSON_TARGET | base64 -d >$SHARED/output/$TASK.json
|
||||||
|
#redis-cli -h $REDIS_SERVER -p $REDIS_PORT SET $TASK "$JSON_TARGET"
|
||||||
|
|
||||||
fi;
|
fi;
|
||||||
|
|
||||||
|
@@ -741,7 +741,7 @@ execute_task() {
|
|||||||
|
|
||||||
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
|
||||||
deploy_additionals "$APP_DIR" "$DEPLOY_NAME" "$DEPLOY_PAYLOAD"
|
deploy_additionals "$APP_DIR" "$DEPLOY_NAME" "$DEPLOY_PAYLOAD"
|
||||||
sh /scripts/check_pid.sh "$PID" "$TASK" "$DATE" "$REDIS_SERVER" "$REDIS_PORT" &
|
sh /scripts/check_pid.sh "$PID" "$SHARED" "$TASK" "$DATE" "$DEBUG" &
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
Reference in New Issue
Block a user