Spaces:
Runtime error
Runtime error
Start app immediately and redirect root
Browse files- scripts/start_space.sh +5 -21
scripts/start_space.sh
CHANGED
|
@@ -5,7 +5,6 @@ export FREECIV_SERVER_URL="${FREECIV_SERVER_URL:-http://127.0.0.1}"
|
|
| 5 |
export FREECIV_USERNAME="${FREECIV_USERNAME:-openenvbot}"
|
| 6 |
export FREECIV_CLIENT_PORT="${FREECIV_CLIENT_PORT:-6000}"
|
| 7 |
export FREECIV_TURN_TIMEOUT_S="${FREECIV_TURN_TIMEOUT_S:-120}"
|
| 8 |
-
export FREECIV_STARTUP_TIMEOUT_S="${FREECIV_STARTUP_TIMEOUT_S:-180}"
|
| 9 |
export ENABLE_WEB_INTERFACE="${ENABLE_WEB_INTERFACE:-true}"
|
| 10 |
|
| 11 |
log_file=/tmp/start_space.log
|
|
@@ -28,27 +27,12 @@ service_status() {
|
|
| 28 |
fi
|
| 29 |
}
|
| 30 |
|
| 31 |
-
|
| 32 |
-
|
| 33 |
-
deadline=$(( $(date +%s) + FREECIV_STARTUP_TIMEOUT_S ))
|
| 34 |
while true; do
|
| 35 |
-
|
| 36 |
-
publite2=$(service_status publite2 http://127.0.0.1/pubstatus)
|
| 37 |
-
tomcat=$(service_status tomcat http://127.0.0.1:8080/freeciv-web/)
|
| 38 |
-
status="$nginx $publite2 $tomcat"
|
| 39 |
-
log "$status"
|
| 40 |
-
if [[ "$nginx" == "nginx=up" && "$publite2" == "publite2=up" && "$tomcat" == "tomcat=up" ]]; then
|
| 41 |
-
return 0
|
| 42 |
-
fi
|
| 43 |
-
if (( $(date +%s) >= deadline )); then
|
| 44 |
-
log "freeciv runtime failed to become ready before timeout=${FREECIV_STARTUP_TIMEOUT_S}s"
|
| 45 |
-
return 1
|
| 46 |
-
fi
|
| 47 |
sleep 2
|
| 48 |
done
|
| 49 |
-
|
| 50 |
-
|
| 51 |
-
log "start_space.sh boot"
|
| 52 |
-
wait_for_runtime
|
| 53 |
-
log "freeciv runtime ready; starting uvicorn"
|
| 54 |
exec python -m uvicorn server.app:app --host 0.0.0.0 --port 8000 --ws-ping-interval 300 --ws-ping-timeout 300
|
|
|
|
| 5 |
export FREECIV_USERNAME="${FREECIV_USERNAME:-openenvbot}"
|
| 6 |
export FREECIV_CLIENT_PORT="${FREECIV_CLIENT_PORT:-6000}"
|
| 7 |
export FREECIV_TURN_TIMEOUT_S="${FREECIV_TURN_TIMEOUT_S:-120}"
|
|
|
|
| 8 |
export ENABLE_WEB_INTERFACE="${ENABLE_WEB_INTERFACE:-true}"
|
| 9 |
|
| 10 |
log_file=/tmp/start_space.log
|
|
|
|
| 27 |
fi
|
| 28 |
}
|
| 29 |
|
| 30 |
+
log "start_space.sh boot"
|
| 31 |
+
(
|
|
|
|
| 32 |
while true; do
|
| 33 |
+
log "$(service_status nginx http://127.0.0.1/) $(service_status publite2 http://127.0.0.1/pubstatus) $(service_status tomcat http://127.0.0.1:8080/freeciv-web/)"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 34 |
sleep 2
|
| 35 |
done
|
| 36 |
+
) &
|
| 37 |
+
log "starting uvicorn immediately"
|
|
|
|
|
|
|
|
|
|
| 38 |
exec python -m uvicorn server.app:app --host 0.0.0.0 --port 8000 --ws-ping-interval 300 --ws-ping-timeout 300
|