From a0eb1ff4dde0276e2b5423bdd1526cc44420c67c Mon Sep 17 00:00:00 2001 From: FailedProxy Date: Fri, 27 Mar 2026 20:15:44 +0000 Subject: [PATCH] test --- common.sh | 58 +++++++++++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 30 deletions(-) diff --git a/common.sh b/common.sh index 07283fc..dbe9613 100644 --- a/common.sh +++ b/common.sh @@ -3,7 +3,7 @@ # ----------------- UNRAID OPS COMMON LIBRARY (STABLE FRAMEWORK v1) ----------------------- # ----------------------------------------------------------------------------------------------- -# ICONS Profiles +# ----------------------------- ICONS ----------------------------- ICON_INFO="ℹ️" ICON_WARN="⚠️" ICON_ERROR="❌" @@ -14,7 +14,7 @@ ICON_RETRY="🔁" ICON_SYNC="🔄" ICON_GEAR="⚙️" -# OUTPUT +# ----------------------------- OUTPUT ----------------------------- info() { echo "$ICON_INFO [INFO] $*"; } warn() { echo "$ICON_WARN [WARN] $*"; } error() { echo "$ICON_ERROR [ERROR] $*"; } @@ -24,7 +24,7 @@ log() { [[ "${ENABLE_LOGGING:-false}" == true ]] && echo "[LOG] $*" } -# ARG PARSER +# ----------------------------- ARG PARSER ----------------------------- parse_args() { ENABLE_LOGGING=${ENABLE_LOGGING:-false} DRY_RUN=${DRY_RUN:-false} @@ -69,12 +69,12 @@ parse_args() { PARSED_ARGS=("${CLEAN_ARGS[@]}") } -# VALIDATION +# ----------------------------- VALIDATION ----------------------------- require_var() { [[ -z "${!1:-}" ]] && error "Missing required: $1" && exit 1 } -# HOST DETECTION +# ----------------------------- HOST DETECTION ----------------------------- detect_hosts() { LOCAL_HOSTNAME="$(hostname)" @@ -100,7 +100,7 @@ detect_hosts() { info "Host: $LOCAL_SERVER_NAME → $REMOTE_SERVER_NAME" } -# REMOTE +# ----------------------------- REMOTE ----------------------------- resolve_remote_ip() { log "Resolving remote IP..." REMOTE_SERVER=$(tailscale ip -4 "$REMOTE_SERVER_NAME" 2>/dev/null) @@ -110,53 +110,53 @@ resolve_remote_ip() { info "Remote IP: $REMOTE_SERVER" } -# CONTAINERS +# ----------------------------- CONTAINERS ----------------------------- RUNNING_CONTAINERS=() stop_containers() { - - if [[ ${#CRITICAL_CONTAINER_NAMES[@]} -eq 0 ]]; then - log "No containers defined to stop" - return - fi + [[ ${#CRITICAL_CONTAINER_NAMES[@]} -eq 0 ]] && return info "Stopping containers..." RUNNING_CONTAINERS=() for c in "${CRITICAL_CONTAINER_NAMES[@]}"; do + log "Checking container: $c" STATUS=$(ssh -i "$SSH_KEY" root@"$REMOTE_SERVER" \ "docker inspect -f '{{.State.Running}}' $c 2>/dev/null" || echo "false") if [[ "$STATUS" == "true" ]]; then - warn "Stopping $c" - RUNNING_CONTAINERS+=("$c") + warn "Stopping $c" + RUNNING_CONTAINERS+=("$c") - if ssh -i "$SSH_KEY" root@"$REMOTE_SERVER" "docker stop $c" >/dev/null; then - success "$c stopped" - else - error "Failed to stop $c" - fi + if ssh -i "$SSH_KEY" root@"$REMOTE_SERVER" "docker stop $c" >/dev/null; then + success "$c stopped" + else + error "Failed to stop $c" + fi + else + log "$c already stopped" fi done } start_containers() { - - if [[ ${#RUNNING_CONTAINERS[@]} -eq 0 ]]; then - log "No containers to restart" - return - fi + [[ ${#RUNNING_CONTAINERS[@]} -eq 0 ]] && return info "Starting containers..." for c in "${RUNNING_CONTAINERS[@]}"; do info "Starting $c" - ssh -i "$SSH_KEY" root@"$REMOTE_SERVER" "docker start $c" >/dev/null + + if ssh -i "$SSH_KEY" root@"$REMOTE_SERVER" "docker start $c" >/dev/null; then + success "$c started" + else + error "Failed to start $c" + fi done } -# RSYNC LIMITER (FIXED FINAL) +# ----------------------------- RSYNC LIMITER ----------------------------- wait_for_rsync() { : "${RETRY_COUNT:=5}" : "${MAX_RSYNC_PROCS:=2}" @@ -164,10 +164,8 @@ wait_for_rsync() { for i in $(seq 1 "$RETRY_COUNT"); do - # ONLY COUNT LOCAL INITIATED RSYNC COMMANDS COUNT=$(ps -eo pid,cmd | grep "[r]sync .*${REMOTE_SERVER:-}" | wc -l || true) - # fallback if REMOTE_SERVER not set yet if [[ -z "$REMOTE_SERVER" ]]; then COUNT=$(pgrep -x rsync | wc -l || true) fi @@ -184,7 +182,7 @@ wait_for_rsync() { exit 1 } -# RSYNC OPTIONS +# ----------------------------- RSYNC OPTIONS ----------------------------- get_rsync_opts() { if [[ -n "${PROFILE_RSYNC_OPTS[$PROFILE_NAME]:-}" ]]; then read -r -a RSYNC_OPTS <<< "${PROFILE_RSYNC_OPTS[$PROFILE_NAME]}" @@ -193,7 +191,7 @@ get_rsync_opts() { fi } -# STATUS +# ----------------------------- STATUS ----------------------------- show_status() { echo "===== STATUS =====" echo "Local: $LOCAL_SERVER_NAME"