fix(boot): bruk /health endepunkt for OPAX ping-sjekk (ikke /ping)
This commit is contained in:
parent
aa0ff9f974
commit
47585e248c
|
|
@ -49,7 +49,7 @@ fi
|
||||||
|
|
||||||
# Last aliases inn i nåværende shell uansett
|
# Last aliases inn i nåværende shell uansett
|
||||||
alias opax='source ~/OSVauco/scripts/osvauco-opax-boot.sh'
|
alias opax='source ~/OSVauco/scripts/osvauco-opax-boot.sh'
|
||||||
alias opax-logg-slutt='opax_logg_slutt' # peker på intern funksjon (bindestrek ugyldig i bash-funksjonsnavn)
|
alias opax-logg-slutt='opax_logg_slutt'
|
||||||
alias mirror-sync='bash ~/OSVauco/scripts/sync-gdrive-mirror.sh'
|
alias mirror-sync='bash ~/OSVauco/scripts/sync-gdrive-mirror.sh'
|
||||||
alias cost-audit='bash ~/OSVauco/scripts/cost-audit.sh'
|
alias cost-audit='bash ~/OSVauco/scripts/cost-audit.sh'
|
||||||
alias roadmap='cat ~/OSVauco/docs/VAUCO_OS_ROADMAP.md'
|
alias roadmap='cat ~/OSVauco/docs/VAUCO_OS_ROADMAP.md'
|
||||||
|
|
@ -158,13 +158,22 @@ printf "\n"
|
||||||
|
|
||||||
# =============================================================================
|
# =============================================================================
|
||||||
# SECTION 2: OPAX HEALTH
|
# SECTION 2: OPAX HEALTH
|
||||||
|
# Bruker /health (autentisert) — appen har ikke /ping
|
||||||
# =============================================================================
|
# =============================================================================
|
||||||
printf "${BOLD}${CYAN} [ OPAX HEALTH ]${NC}\n"
|
printf "${BOLD}${CYAN} [ OPAX HEALTH ]${NC}\n"
|
||||||
PING_URL="https://opax.vauco.no/ping"
|
HEALTH_URL="https://opax.vauco.no/health"
|
||||||
if curl -fsS --max-time 5 "$PING_URL" >/dev/null 2>&1; then
|
ID_TOKEN=$(gcloud auth print-identity-token 2>/dev/null || echo "")
|
||||||
printf " $OK opax.vauco.no ${DIM}%s${NC}\n" "$PING_URL"
|
if [[ -n "$ID_TOKEN" ]] && curl -fsS --max-time 5 \
|
||||||
|
-H "Authorization: Bearer ${ID_TOKEN}" \
|
||||||
|
"$HEALTH_URL" >/dev/null 2>&1; then
|
||||||
|
printf " $OK opax.vauco.no ${DIM}/health — {\"status\":\"ok\"}${NC}\n"
|
||||||
else
|
else
|
||||||
printf " $FAIL opax.vauco.no ${RED}NEDE — sjekk Cloud Run / DNS${NC}\n"
|
HTTP_CODE=$(curl -o /dev/null -s -w "%{http_code}" --max-time 5 "$HEALTH_URL" 2>/dev/null || echo "000")
|
||||||
|
case "$HTTP_CODE" in
|
||||||
|
403) printf " $WARN opax.vauco.no ${YELLOW}Oppe men krever auth (403) — IAP konfigureres i Phase 5${NC}\n" ;;
|
||||||
|
000) printf " $FAIL opax.vauco.no ${RED}NEDE — ingen respons (sjekk Cloud Run / DNS)${NC}\n" ;;
|
||||||
|
*) printf " $WARN opax.vauco.no ${YELLOW}HTTP %s — sjekk Cloud Run${NC}\n" "$HTTP_CODE" ;;
|
||||||
|
esac
|
||||||
fi
|
fi
|
||||||
printf "\n"
|
printf "\n"
|
||||||
|
|
||||||
|
|
@ -255,13 +264,20 @@ printf " ${DIM}(skriv kort beskrivelse, trykk Enter)${NC}\n > "
|
||||||
read -r SESSION_DESC
|
read -r SESSION_DESC
|
||||||
[[ -z "$SESSION_DESC" ]] && SESSION_DESC="(ingen beskrivelse)"
|
[[ -z "$SESSION_DESC" ]] && SESSION_DESC="(ingen beskrivelse)"
|
||||||
|
|
||||||
|
_OPAX_HEALTH="NEDE"
|
||||||
|
if [[ -n "$ID_TOKEN" ]] && curl -fsS --max-time 3 \
|
||||||
|
-H "Authorization: Bearer ${ID_TOKEN}" \
|
||||||
|
"$HEALTH_URL" >/dev/null 2>&1; then
|
||||||
|
_OPAX_HEALTH="OK"
|
||||||
|
fi
|
||||||
|
|
||||||
cat >> "$SESSION_LOG" << EOF
|
cat >> "$SESSION_LOG" << EOF
|
||||||
|
|
||||||
---
|
---
|
||||||
## Session: $SESSION_ID
|
## Session: $SESSION_ID
|
||||||
- Tid : $(date '+%Y-%m-%d %H:%M %Z')
|
- Tid : $(date '+%Y-%m-%d %H:%M %Z')
|
||||||
- Bruker : ${ACCOUNT:-ukjent}
|
- Bruker : ${ACCOUNT:-ukjent}
|
||||||
- OPAX : $(curl -fsS --max-time 3 "https://opax.vauco.no/ping" >/dev/null 2>&1 && echo OK || echo NEDE)
|
- OPAX : ${_OPAX_HEALTH}
|
||||||
- Lokal : $LOCAL_SHA @ $LOCAL_BRANCH
|
- Lokal : $LOCAL_SHA @ $LOCAL_BRANCH
|
||||||
- Remote : ${REMOTE_SHA:-ukjent}
|
- Remote : ${REMOTE_SHA:-ukjent}
|
||||||
- Mål : $SESSION_DESC
|
- Mål : $SESSION_DESC
|
||||||
|
|
@ -290,8 +306,6 @@ printf "${DIM} ---------------------------------------------------${NC}\n\n"
|
||||||
|
|
||||||
# =============================================================================
|
# =============================================================================
|
||||||
# AVSLUTT-FUNKSJON
|
# AVSLUTT-FUNKSJON
|
||||||
# Navn: opax_logg_slutt (understrek, ikke bindestrek — POSIX-kompatibelt)
|
|
||||||
# Bruk: opax-logg-slutt (via alias over)
|
|
||||||
# =============================================================================
|
# =============================================================================
|
||||||
opax_logg_slutt() {
|
opax_logg_slutt() {
|
||||||
PROMPT_COMMAND="${PROMPT_COMMAND//_opax_log_cmd; /}"
|
PROMPT_COMMAND="${PROMPT_COMMAND//_opax_log_cmd; /}"
|
||||||
|
|
@ -314,7 +328,6 @@ EOF
|
||||||
printf " ${GREEN}[OK]${NC} Logg oppdatert → docs/OSVAUCO_OPAX_SESSION_LOG.md\n\n"
|
printf " ${GREEN}[OK]${NC} Logg oppdatert → docs/OSVAUCO_OPAX_SESSION_LOG.md\n\n"
|
||||||
}
|
}
|
||||||
export -f opax_logg_slutt 2>/dev/null || true
|
export -f opax_logg_slutt 2>/dev/null || true
|
||||||
# Alias så brukeren skriver opax-logg-slutt som før
|
|
||||||
alias opax-logg-slutt='opax_logg_slutt'
|
alias opax-logg-slutt='opax_logg_slutt'
|
||||||
|
|
||||||
printf " ${DIM}Avslutt session → ${NC}${BOLD}opax-logg-slutt${NC}\n\n"
|
printf " ${DIM}Avslutt session → ${NC}${BOLD}opax-logg-slutt${NC}\n\n"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user