Updated framework

2026-03-27 16:50:20 +00:00
parent 24c7a481c8
commit 4faf5d2b96
11 changed files with 994 additions and 398 deletions
@@ -20,142 +20,195 @@ set -e

 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"

-# Load configs & helpers
+# Core System
 source "$SCRIPT_DIR/../Master.conf"
 source "$SCRIPT_DIR/../common.sh"

+parse_args "$@"
+
 # Input
-DIRECTORY="$1"
 if [[ -z "$DIRECTORY" ]]; then
-    echo "Usage: $0 <directory-to-sync> [--dry-run] [VAR=value ...]"
+    echo "Usage: $0 <directory-to-sync> [--dry-run] [--status] [VAR=value ...]"
    exit 1
 fi
 shift
-parse_args "$@"

-# Host & IP
+# Host
 detect_hosts
-resolve_remote_ip
+resolve_remote

 # Profile
 PROFILE_NAME=$(basename "$DIRECTORY" | tr '[:upper:]' '[:lower:]')

+log "ℹ️ Detected profile: $PROFILE_NAME"
+
+# Safe array normalization
+normalize_list() {
+    local input="$1"
+    [[ -z "$input" ]] && return
+    read -r -a __out <<< "$input"
+    echo "${__out[@]}"
+}
+
+CRITICAL_CONTAINER_NAMES=($(normalize_list "${PROFILE_CRITICAL_CONTAINER_NAMES[$PROFILE_NAME]}"))
+DELAYED_CONTAINERS=($(normalize_list "${PROFILE_DELAYED_CONTAINERS[$PROFILE_NAME]}"))
+EXCLUDE_DIRS=($(normalize_list "${PROFILE_EXCLUDE_DIRS[$PROFILE_NAME]}"))
+
+# Profile overrides
 MAX_RSYNC_PROCS=${PROFILE_MAX_PROCS[$PROFILE_NAME]:-$MAX_RSYNC_PROCS}
 BW_LIMIT=${PROFILE_BW_LIMIT[$PROFILE_NAME]:-$BW_LIMIT}
-CRITICAL_CONTAINER_NAMES=(${PROFILE_CRITICAL_CONTAINER_NAMES[$PROFILE_NAME]})
-DELAYED_CONTAINERS=(${PROFILE_DELAYED_CONTAINERS[$PROFILE_NAME]})
-CONTAINER_DELAY=${PROFILE_CONTAINER_DELAY[$PROFILE_NAME]:-$CONTAINER_DELAY}
 RETRY_COUNT=${PROFILE_RETRY_COUNT[$PROFILE_NAME]:-$RETRY_COUNT}
 SLEEP=${PROFILE_SLEEP[$PROFILE_NAME]:-$SLEEP}
-EXCLUDE_DIRS=(${PROFILE_EXCLUDE_DIRS[$PROFILE_NAME]:-${EXCLUDE_DIRS[@]}})
+CONTAINER_DELAY=${PROFILE_CONTAINER_DELAY[$PROFILE_NAME]:-$CONTAINER_DELAY}

 # Status Mode
 if [[ "$SHOW_STATUS" == true ]]; then
-    show_status
+    echo "=================================================="
+    echo " ℹ️ RSYNC STATUS"
+    echo "--------------------------------------------------"
+    echo " 📁 Source:     $DIRECTORY"
+    echo " 🌐 Remote:     $REMOTE_SERVER"
+    echo " 🧩 Profile:    $PROFILE_NAME"
+    echo " 🚦 BW_LIMIT:   $BW_LIMIT"
+    echo " 🔁 Max Procs:  $MAX_RSYNC_PROCS"
+    echo " 🔁 Retries:    $RETRY_COUNT"
+    echo " 🧪 Dry Run:    $DRY_RUN"
+    echo " 📦 Containers: ${CRITICAL_CONTAINER_NAMES[*]}"
+    echo " 🚫 Excludes:   ${EXCLUDE_DIRS[*]}"
+    echo "=================================================="
    exit 0
 fi

-
-# User Info
+# Header
+echo
 echo "============================================================"
-echo " Sync Job Starting"
+echo " 🚀 SYNC STARTING"
 echo "------------------------------------------------------------"
-echo " Source:      $DIRECTORY"
-echo " Destination: $REMOTE_SERVER:$DIRECTORY"
-echo " Profile:     $PROFILE_NAME"
-echo " Dry Run:     $DRY_RUN"
+echo " 📁 Source:      $DIRECTORY"
+echo " 🌐 Destination: $REMOTE_SERVER:$DIRECTORY"
+echo " 🧩 Profile:     $PROFILE_NAME"
+echo " 🧪 Dry Run:     $DRY_RUN"
 echo "============================================================"

-log "Settings: MAX_RSYNC_PROCS=$MAX_RSYNC_PROCS, BW_LIMIT=$BW_LIMIT"
-log "Containers: ${CRITICAL_CONTAINER_NAMES[*]}"
-log "Excludes: ${EXCLUDE_DIRS[*]}"
+log "ℹ️ MAX_RSYNC_PROCS=$MAX_RSYNC_PROCS BW_LIMIT=$BW_LIMIT"
+log "ℹ️ Containers: ${CRITICAL_CONTAINER_NAMES[*]}"
+log "ℹ️ Excludes: ${EXCLUDE_DIRS[*]}"

-# Rsync Wait
+# RSYNC SLOT CONTROL
 wait_for_rsync() {
    for attempt in $(seq 1 "$RETRY_COUNT"); do
+
        RSYNC_COUNT=$(pgrep -fc "rsync.*root@${REMOTE_SERVER}" || true)
-        if [ "$RSYNC_COUNT" -ge "$MAX_RSYNC_PROCS" ]; then
-            echo "Waiting for available rsync slot... ($RSYNC_COUNT running)"
-            log "RSYNC_COUNT=$RSYNC_COUNT >= MAX=$MAX_RSYNC_PROCS"
+
+        if [[ "$RSYNC_COUNT" -ge "$MAX_RSYNC_PROCS" ]]; then
+            warn "🟡 Waiting for rsync slot ($RSYNC_COUNT active)"
            sleep "$SLEEP"
        else
            return 0
        fi
    done
-    echo "Too many rsync processes, exiting."
-    exit 1
+
+    error "🔴 Too many rsync processes running"
 }

-# Main
+# MAIN
 main() {
-    echo ""
-    echo "🔍 Checking remote connectivity..."
+
+    info "ℹ️ Checking remote connectivity..."

    for i in $(seq 1 "$RETRY_COUNT"); do
        if ping -c 1 "$REMOTE_SERVER" &>/dev/null; then
-            echo "✅ Remote server reachable"
+            info "🟢 Remote reachable"
            break
        fi
-        echo "⚠️  Remote down, retrying in $SLEEP seconds..."
+
+        warn "🟡 Remote unreachable (attempt $i/$RETRY_COUNT)"
        sleep "$SLEEP"
    done

    if ! ping -c 1 "$REMOTE_SERVER" &>/dev/null; then
-        echo "❌ Remote server unreachable. Exiting."
-        exit 1
+        error "🔴 Remote server unreachable"
    fi

    wait_for_rsync

-    echo ""
-    echo "🛑 Stopping containers on remote..."
+    info "🟡 Stopping containers on remote..."
    stop_containers

-    echo ""
-    echo "📦 Building rsync options..."
+    # Build RSYNC OPTIONS
    get_rsync_opts

    for ex in "${EXCLUDE_DIRS[@]}"; do
        RSYNC_OPTS+=(--exclude="$ex")
    done

-    [ "$DRY_RUN" = true ] && RSYNC_OPTS+=("--dry-run")
+    if [[ "$DRY_RUN" == true ]]; then
+        RSYNC_OPTS+=(--dry-run)
+        info "🧪 Dry-run enabled"
+    fi

-    log "Final rsync opts: ${RSYNC_OPTS[*]}"
+    log "ℹ️ Final rsync opts: ${RSYNC_OPTS[*]}"

-    echo ""
-    echo "🚀 Starting rsync..."
+    # EXECUTION
+    info "🚀 Starting rsync..."
+
+    START_TIME=$(date +%s)

    for attempt in $(seq 1 "$RETRY_COUNT"); do
-        echo "Attempt $attempt/$RETRY_COUNT"
+        info "ℹ️ Attempt $attempt/$RETRY_COUNT"

        if rsync "${RSYNC_OPTS[@]}" \
-            -e "ssh -i \"$SSH_KEY\" -T -o Compression=no -o IPQoS=throughput" \
+            -e "ssh -i $SSH_KEY -T -o Compression=no -o IPQoS=throughput" \
            "$DIRECTORY" "root@${REMOTE_SERVER}:$DIRECTORY"; then

-            echo "✅ Rsync completed successfully"
+            info "🟢 Rsync completed successfully"
            break
-
        else
-            echo "❌ Rsync failed"
+            warn "❌ Rsync failed"

-            if [ "$attempt" -lt "$RETRY_COUNT" ]; then
-                echo "Retrying in $SLEEP seconds..."
+            if [[ "$attempt" -lt "$RETRY_COUNT" ]]; then
+                warn "🟡 Retrying in $SLEEP seconds..."
                sleep "$SLEEP"
            else
-                echo "💥 All retries failed"
+                error "🔴 All rsync attempts failed"
                start_containers
-                exit 1
            fi
        fi
    done

-    echo ""
-    echo "🔄 Restarting containers..."
+    # FINALIZE
+    info "🟡 Restarting containers..."
    start_containers

-    echo ""
-    echo "🎉 Sync complete!"
+    END_TIME=$(date +%s)
+    DURATION=$((END_TIME - START_TIME))
+
+    # SUMMARY
+    echo "============================================================"
+
+    if [[ "${PIPESTATUS[0]}" -eq 0 ]]; then
+        echo " 🟢 SYNC SUMMARY"
+        echo "------------------------------------------------------------"
+        echo " 📁 Directory:   $DIRECTORY"
+        echo " 🧩 Profile:     $PROFILE_NAME"
+        echo " 🌐 Remote:      $REMOTE_SERVER"
+        echo " ⏱ Duration:     ${DURATION}s"
+        echo " 📡 Status:      🟢 SUCCESS"
+        echo " 🧪 Dry Run:     $DRY_RUN"
+    else
+        echo " 🔴 SYNC SUMMARY"
+        echo "------------------------------------------------------------"
+        echo " 📁 Directory:   $DIRECTORY"
+        echo " 🧩 Profile:     $PROFILE_NAME"
+        echo " 🌐 Remote:      $REMOTE_SERVER"
+        echo " ⏱ Duration:     ${DURATION}s"
+        echo " 📡 Status:      🔴 FAILED"
+        echo " 🧪 Dry Run:     $DRY_RUN"
+    fi
+
+    echo "============================================================"
+
+    info "ℹ️ Sync complete"
 }

 main