Compare commits
2 Commits
1.0.3
...
43b529d2d0
Author | SHA1 | Date | |
---|---|---|---|
43b529d2d0 | |||
81cc2b14ab |
@@ -560,6 +560,7 @@ upgrade() {
|
||||
$service_exec $NAME.json stop force
|
||||
$service_exec $NAME.json start info &
|
||||
fi
|
||||
PID=$!
|
||||
}
|
||||
|
||||
execute_task() {
|
||||
@@ -911,12 +912,13 @@ execute_task() {
|
||||
if [ "$NAME" == "framework" ]; then
|
||||
upgrade_scheduler
|
||||
upgrade "web-installer"
|
||||
#CONTAINERS=$(docker ps -a --format '{{.Names}} {{.Status}}' | grep -E 'framework-scheduler|webserver')
|
||||
else
|
||||
upgrade "$NAME"
|
||||
#CONTAINERS=$(docker ps -a --format '{{.Names}} {{.Status}}' | grep -w "$NAME")
|
||||
fi
|
||||
CONTAINERS=$(docker ps -a --format '{{.Names}} {{.Status}}' | grep -E 'framework-scheduler|webserver')
|
||||
RESULT=$(echo "$CONTAINERS" | base64 -w0)
|
||||
JSON_TARGET=$(echo '{ "DATE": "'$DATE'", "RESULT": "'$RESULT'" }' | jq -r . | base64 -w0)
|
||||
#RESULT=$(echo "$CONTAINERS" | base64 -w0)
|
||||
sh /scripts/check_pid.sh "$PID" "$SHARED" "$TASK_NAME-$NAME" "$DATE" "$DEBUG" &
|
||||
fi
|
||||
|
||||
if [ "$TASK_NAME" != "check_vpn" ]; then
|
||||
|
Reference in New Issue
Block a user