diff --git a/Orchestrators/watchdog_orchestrator.sh b/Orchestrators/watchdog_orchestrator.sh index 6529054..126a22f 100755 --- a/Orchestrators/watchdog_orchestrator.sh +++ b/Orchestrators/watchdog_orchestrator.sh @@ -128,7 +128,7 @@ fi # ============================================================================================== UPTIME_SECONDS=$(awk '{print int($1)}' /proc/uptime) 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 fi diff --git a/Watchdogs/System/network_watchdog.sh b/Watchdogs/System/network_watchdog.sh index 2e9c953..621c1c3 100755 --- a/Watchdogs/System/network_watchdog.sh +++ b/Watchdogs/System/network_watchdog.sh @@ -121,7 +121,7 @@ acquire_lock 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" touch "${NETWORK_WATCHDOG_NPM_STATE_FILE}" 2>/dev/null diff --git a/Watchdogs/docker_watchdog.sh b/Watchdogs/docker_watchdog.sh index cfa687e..741fe37 100755 --- a/Watchdogs/docker_watchdog.sh +++ b/Watchdogs/docker_watchdog.sh @@ -235,7 +235,7 @@ acquire_lock detect_hosts 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 fi @@ -631,7 +631,7 @@ CYCLE_START=$(date +%s) # ── Parity check — skip restarts during parity ─────────────────────────────────────────── 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 fi @@ -944,11 +944,11 @@ CYCLE_START=$(date +%s) TOTAL_WARNINGS=$(( T1_WARNINGS + T2_WARNINGS )) 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 - echo "$ICON_WATCHDOG T1: $T1_RESTARTS restarts / $T1_WARNINGS warnings" - echo "$ICON_WATCHDOG T2: $T2_RESTARTS restarts / $T2_WARNINGS warnings" - echo "$ICON_TIME Duration: $(format_duration $(( CYCLE_END - CYCLE_START )))" + echo "$ICON_WATCHDOG T1: $T1_RESTARTS restarts / $T1_WARNINGS warnings T2: $T2_RESTARTS restarts / $T2_WARNINGS warnings" + echo "$ICON_TIME Duration: $(format_duration $(( CYCLE_END - CYCLE_START ))) Containers: $CONTAINER_COUNT" echo "━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━" else - echo "All healthy ✅ ($(date '+%H:%M:%S'))" + echo "All healthy ✅ — ${CONTAINER_COUNT} containers ($(date '+%H:%M:%S'))" fi \ No newline at end of file diff --git a/unRAID_Essentials/unraid_api_key_renew.sh b/unRAID_Essentials/unraid_api_key_renew.sh index 3dc16e3..a08ab4c 100755 --- a/unRAID_Essentials/unraid_api_key_renew.sh +++ b/unRAID_Essentials/unraid_api_key_renew.sh @@ -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) 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 fi @@ -86,4 +87,4 @@ else fi PREVIEW="${KEY:0:8}...${KEY: -4}" -log "API key renewed — $VAR_NAME = $PREVIEW" +warn "API key renewed ✅ — $VAR_NAME = $PREVIEW (registry had lost it)"