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

Enhance upgrade function to handle webserver service separately and improve logging
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-07-23 16:59:46 +02:00
parent 274e9456ea
commit 5b2e3436f5
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
scripts/scheduler/entrypoint.sh
View File

@@ -736,10 +736,19 @@ upgrade_scheduler() {
upgrade() { upgrade() {
local NAME=$1 local NAME=$1
debug "$service_exec $NAME.json stop force" if [ "$NAME" == "webserver" ]; then
$service_exec $NAME.json stop force debug "$service_exec service-framework.containers.$NAME stop force"
debug "$service_exec $NAME.json start info" $service_exec service-framework.containers.$NAME stop force
$service_exec $NAME.json start info & debug "$service_exec service-framework.containers.$NAME start info"
$service_exec service-framework.containers.$NAME start info &
else
debug "$service_exec $NAME.json stop force"
$service_exec $NAME.json stop force
debug "$service_exec $NAME.json start info"
$service_exec $NAME.json start info &
fi
PID=$! PID=$!
} }
@@ -1156,6 +1165,9 @@ execute_task() {
JSON="$(echo $B64_JSON | base64 -d)" JSON="$(echo $B64_JSON | base64 -d)"
NAME=$(echo "$JSON" | jq -r .NAME | awk '{print tolower($0)}') NAME=$(echo "$JSON" | jq -r .NAME | awk '{print tolower($0)}')
if [ "$NAME" == "framework" ]; then if [ "$NAME" == "framework" ]; then
JSON_TARGET=$(echo '{"DATE":"'$DATE'","INSTALL_STATUS":0}' | jq -r . | base64 -w0)
echo "Upgrading service: webserver"
upgrade webserver
echo "Upgrading framework scheduler..." echo "Upgrading framework scheduler..."
echo "Cleaning temporary files..." echo "Cleaning temporary files..."
@@ -1165,6 +1177,7 @@ execute_task() {
upgrade_scheduler upgrade_scheduler
echo "Removing old framework scheduler container..." echo "Removing old framework scheduler container..."
JSON_TARGET=$(echo '{"DATE":"'$DATE'","INSTALL_STATUS":1}' | jq -r . | base64 -w0)
sleep 1 sleep 1
/usr/bin/docker rm -f $HOSTNAME /usr/bin/docker rm -f $HOSTNAME