FailedProxy/Varaverk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

output: watchdog visibility — parity/grace/disabled exits now echo, docker_watchdog container count, api_key_renew status always visible

Browse Source
This commit is contained in:
Gmer4Lfe
2026-06-01 20:22:52 -04:00
parent f8325a7067
commit 5e89f334bb
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Orchestrators/watchdog_orchestrator.sh
+1 -1
View File
@@ -128,7 +128,7 @@ fi
# ============================================================================================== # ==============================================================================================
UPTIME_SECONDS=$(awk '{print int($1)}' /proc/uptime) UPTIME_SECONDS=$(awk '{print int($1)}' /proc/uptime)
if [[ "$UPTIME_SECONDS" -lt "$WATCHDOG_STARTUP_GRACE" ]]; then if [[ "$UPTIME_SECONDS" -lt "$WATCHDOG_STARTUP_GRACE" ]]; then
log "Startup grace — ${UPTIME_SECONDS}s / ${WATCHDOG_STARTUP_GRACE}s — skipping cycle" echo "Startup grace — $(format_duration $UPTIME_SECONDS) / $(format_duration $WATCHDOG_STARTUP_GRACE) — skipping cycle"
exit 0 exit 0
fi fi
Watchdogs/System/network_watchdog.sh
+1 -1
View File
@@ -121,7 +121,7 @@ acquire_lock
detect_hosts detect_hosts
[[ "${NETWORK_WATCHDOG_ENABLED:-true}" != "true" ]] && log "Network watchdog disabled" && exit 0 [[ "${NETWORK_WATCHDOG_ENABLED:-true}" != "true" ]] && echo "Network watchdog disabled" && exit 0
[[ "$DRY_RUN" == true ]] && warn "DRY RUN — no containers will be restarted" [[ "$DRY_RUN" == true ]] && warn "DRY RUN — no containers will be restarted"
touch "${NETWORK_WATCHDOG_NPM_STATE_FILE}" 2>/dev/null touch "${NETWORK_WATCHDOG_NPM_STATE_FILE}" 2>/dev/null
Watchdogs/docker_watchdog.sh
+6 -6
View File
@@ -235,7 +235,7 @@ acquire_lock
detect_hosts detect_hosts
if ! is_docker_enabled; then if ! is_docker_enabled; then
log "Docker not enabled in Unraid settings — skipping cycle" echo "Docker not enabled in Unraid settings — skipping cycle"
exit 0 exit 0
fi fi
@@ -631,7 +631,7 @@ CYCLE_START=$(date +%s)
# ── Parity check — skip restarts during parity ─────────────────────────────────────────── # ── Parity check — skip restarts during parity ───────────────────────────────────────────
if is_parity_running; then if is_parity_running; then
log "Parity check in progress — skipping restart actions this run" echo "Parity in progress — restart actions skipped ($(date '+%H:%M:%S'))"
exit 0 exit 0
fi fi
@@ -944,11 +944,11 @@ CYCLE_START=$(date +%s)
TOTAL_WARNINGS=$(( T1_WARNINGS + T2_WARNINGS )) TOTAL_WARNINGS=$(( T1_WARNINGS + T2_WARNINGS ))
CYCLE_END=$(date +%s) CYCLE_END=$(date +%s)
CONTAINER_COUNT=$(docker ps -q 2>/dev/null | wc -l | tr -d ' ')
if [[ "$TOTAL_RESTARTS" -gt 0 || "$TOTAL_WARNINGS" -gt 0 ]]; then if [[ "$TOTAL_RESTARTS" -gt 0 || "$TOTAL_WARNINGS" -gt 0 ]]; then
echo "$ICON_WATCHDOG T1: $T1_RESTARTS restarts / $T1_WARNINGS warnings" echo "$ICON_WATCHDOG T1: $T1_RESTARTS restarts / $T1_WARNINGS warnings T2: $T2_RESTARTS restarts / $T2_WARNINGS warnings"
echo "$ICON_WATCHDOG T2: $T2_RESTARTS restarts / $T2_WARNINGS warnings" echo "$ICON_TIME Duration: $(format_duration $(( CYCLE_END - CYCLE_START ))) Containers: $CONTAINER_COUNT"
echo "$ICON_TIME Duration: $(format_duration $(( CYCLE_END - CYCLE_START )))"
echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━" echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━"
else else
echo "All healthy ✅ ($(date '+%H:%M:%S'))" echo "All healthy ✅ — ${CONTAINER_COUNT} containers ($(date '+%H:%M:%S'))"
fi fi
unRAID_Essentials/unraid_api_key_renew.sh
+3 -2
View File
@@ -58,7 +58,8 @@ EXISTING=$(timeout 5 /usr/local/sbin/unraid-api apikey --name "Varaverk" --json
KEY=$(echo "$EXISTING" | jq -r '.key // empty' 2>/dev/null) KEY=$(echo "$EXISTING" | jq -r '.key // empty' 2>/dev/null)
if [[ -n "$KEY" ]]; then if [[ -n "$KEY" ]]; then
log "API key already valid in registry — no renewal needed" PREVIEW="${KEY:0:8}...${KEY: -4}"
echo "API key valid ✅ — $VAR_NAME = $PREVIEW"
exit 0 exit 0
fi fi
@@ -86,4 +87,4 @@ else
fi fi
PREVIEW="${KEY:0:8}...${KEY: -4}" PREVIEW="${KEY:0:8}...${KEY: -4}"
log "API key renewed — $VAR_NAME = $PREVIEW" warn "API key renewed ✅ — $VAR_NAME = $PREVIEW (registry had lost it)"