bug fixes

Rsync/rsync.sh

@@ -11,18 +11,13 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "$SCRIPT_DIR/../Master.conf"
 source "$SCRIPT_DIR/../common.sh"
 
-# ARG PARSING FIX
 DIRECTORY=""
 RAW_ARGS=()
 
 for ARG in "$@"; do
     case "$ARG" in
-        --*|*=*)
-            RAW_ARGS+=("$ARG")
-            ;;
-        *)
-            [[ -z "$DIRECTORY" ]] && DIRECTORY="$ARG" || RAW_ARGS+=("$ARG")
-            ;;
+        --*|*=*) RAW_ARGS+=("$ARG") ;;
+        *) [[ -z "$DIRECTORY" ]] && DIRECTORY="$ARG" || RAW_ARGS+=("$ARG") ;;
     esac
 done
 
@@ -30,95 +25,46 @@ parse_args "${RAW_ARGS[@]}"
 
 [[ -z "$DIRECTORY" ]] && error "Missing directory" && exit 1
 
-# HOST
 detect_hosts
 resolve_remote_ip
 
-# PROFILE
 PROFILE_NAME=$(basename "$DIRECTORY" | tr '[:upper:]' '[:lower:]')
 
 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[@]}})
 
-# STATUS
-if [[ "${SHOW_STATUS:-false}" == true ]]; then
-    show_status
-    exit 0
-fi
+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}
+EXCLUDE_DIRS="${PROFILE_EXCLUDE_DIRS[$PROFILE_NAME]}"
+
+[[ "$SHOW_STATUS" == true ]] && show_status && exit 0
 
-# HEADER
-echo
 echo "$ICON_RUN Sync Starting"
 echo "Source: $DIRECTORY"
 echo "Remote: $REMOTE_SERVER:$DIRECTORY"
 echo "Profile: $PROFILE_NAME"
-echo "Dry Run: $DRY_RUN"
-
-# REMOTE CHECK FIX
-echo "$ICON_GEAR Checking remote..."
-
-REMOTE_OK=false
-
-for i in $(seq 1 "$RETRY_COUNT"); do
-    if ping -c 1 "$REMOTE_SERVER" &>/dev/null; then
-        success "Remote reachable"
-        REMOTE_OK=true
-        break
-    fi
-    warn "Retry $i/$RETRY_COUNT"
-    sleep "$SLEEP"
-done
-
-if [[ "$REMOTE_OK" != true ]]; then
-    error "Remote unreachable"
-    exit 1
-fi
-
-# RSYNC LIMIT
-wait_for_rsync() {
-    for i in $(seq 1 "$RETRY_COUNT"); do
-        COUNT=$(pgrep -fc "rsync.*root@${REMOTE_SERVER}" || true)
-
-        if [[ "$COUNT" -ge "$MAX_RSYNC_PROCS" ]]; then
-            warn "Waiting rsync slot ($COUNT)"
-            sleep "$SLEEP"
-        else
-            return 0
-        fi
-    done
-
-    error "Too many rsync processes"
-    exit 1
-}
 
 wait_for_rsync
 
-# RUN
 stop_containers
 
 get_rsync_opts
 
-for ex in "${EXCLUDE_DIRS[@]}"; do
+for ex in $EXCLUDE_DIRS; do
     RSYNC_OPTS+=(--exclude="$ex")
 done
 
 [[ "$DRY_RUN" == true ]] && RSYNC_OPTS+=("--dry-run")
 
-echo "$ICON_RUN Running rsync..."
-
 START=$(date +%s)
 
 for i in $(seq 1 "$RETRY_COUNT"); do
     if rsync "${RSYNC_OPTS[@]}" \
         -e "ssh -i $SSH_KEY -T -o Compression=no -o IPQoS=throughput" \
         "$DIRECTORY" "root@${REMOTE_SERVER}:$DIRECTORY"; then
-
         success "Rsync complete"
         break
     else
@@ -130,7 +76,7 @@ done
 start_containers
 
 END=$(date +%s)
-echo
+
 echo "===== SUMMARY ====="
 echo "Directory: $DIRECTORY"
 echo "Profile:   $PROFILE_NAME"