From f3abddddc2f0393efa2977e8d4d1c53e6d7b2d65 Mon Sep 17 00:00:00 2001 From: FailedProxy Date: Fri, 27 Mar 2026 17:50:01 +0000 Subject: [PATCH] tweak --- Rsync/rsync.sh | 171 ++++++++++++++++------------------------------ common.sh | 181 ++++++++++++++++++++++++++++++------------------- 2 files changed, 170 insertions(+), 182 deletions(-) diff --git a/Rsync/rsync.sh b/Rsync/rsync.sh index dd290e8..9ca885f 100644 --- a/Rsync/rsync.sh +++ b/Rsync/rsync.sh @@ -20,195 +20,142 @@ set -e SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -# Core System +# Load configs & helpers source "$SCRIPT_DIR/../Master.conf" source "$SCRIPT_DIR/../common.sh" -parse_args "$@" - -# Input +# ----------------------------- Input ----------------------------- +DIRECTORY="$1" if [[ -z "$DIRECTORY" ]]; then - echo "Usage: $0 [--dry-run] [--status] [VAR=value ...]" + echo "Usage: $0 [--dry-run] [VAR=value ...]" exit 1 fi shift +parse_args "$@" -# Host +# ----------------------------- Host & IP ----------------------------- detect_hosts -resolve_remote +resolve_remote_ip -# Profile +# ----------------------------- 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} -CONTAINER_DELAY=${PROFILE_CONTAINER_DELAY[$PROFILE_NAME]:-$CONTAINER_DELAY} +EXCLUDE_DIRS=(${PROFILE_EXCLUDE_DIRS[$PROFILE_NAME]:-${EXCLUDE_DIRS[@]}}) -# Status Mode +# ----------------------------- Status Mode ----------------------------- if [[ "$SHOW_STATUS" == true ]]; then - 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 "==================================================" + show_status exit 0 fi -# Header -echo + +# ----------------------------- User Info ----------------------------- echo "============================================================" -echo " ๐Ÿš€ SYNC STARTING" +echo " Sync Job 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 "โ„น๏ธ MAX_RSYNC_PROCS=$MAX_RSYNC_PROCS BW_LIMIT=$BW_LIMIT" -log "โ„น๏ธ Containers: ${CRITICAL_CONTAINER_NAMES[*]}" -log "โ„น๏ธ Excludes: ${EXCLUDE_DIRS[*]}" +log "Settings: MAX_RSYNC_PROCS=$MAX_RSYNC_PROCS, BW_LIMIT=$BW_LIMIT" +log "Containers: ${CRITICAL_CONTAINER_NAMES[*]}" +log "Excludes: ${EXCLUDE_DIRS[*]}" -# RSYNC SLOT CONTROL +# ----------------------------- Rsync Wait ----------------------------- 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 - warn "๐ŸŸก Waiting for rsync slot ($RSYNC_COUNT active)" + 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" sleep "$SLEEP" else return 0 fi done - - error "๐Ÿ”ด Too many rsync processes running" + echo "Too many rsync processes, exiting." + exit 1 } -# MAIN +# ----------------------------- Main ----------------------------- main() { - - info "โ„น๏ธ Checking remote connectivity..." + echo "" + echo "๐Ÿ” Checking remote connectivity..." for i in $(seq 1 "$RETRY_COUNT"); do if ping -c 1 "$REMOTE_SERVER" &>/dev/null; then - info "๐ŸŸข Remote reachable" + echo "โœ… Remote server reachable" break fi - - warn "๐ŸŸก Remote unreachable (attempt $i/$RETRY_COUNT)" + echo "โš ๏ธ Remote down, retrying in $SLEEP seconds..." sleep "$SLEEP" done if ! ping -c 1 "$REMOTE_SERVER" &>/dev/null; then - error "๐Ÿ”ด Remote server unreachable" + echo "โŒ Remote server unreachable. Exiting." + exit 1 fi wait_for_rsync - info "๐ŸŸก Stopping containers on remote..." + echo "" + echo "๐Ÿ›‘ Stopping containers on remote..." stop_containers - # Build RSYNC OPTIONS + echo "" + echo "๐Ÿ“ฆ Building rsync options..." get_rsync_opts for ex in "${EXCLUDE_DIRS[@]}"; do RSYNC_OPTS+=(--exclude="$ex") done - if [[ "$DRY_RUN" == true ]]; then - RSYNC_OPTS+=(--dry-run) - info "๐Ÿงช Dry-run enabled" - fi + [ "$DRY_RUN" = true ] && RSYNC_OPTS+=("--dry-run") - log "โ„น๏ธ Final rsync opts: ${RSYNC_OPTS[*]}" + log "Final rsync opts: ${RSYNC_OPTS[*]}" - # EXECUTION - info "๐Ÿš€ Starting rsync..." - - START_TIME=$(date +%s) + echo "" + echo "๐Ÿš€ Starting rsync..." for attempt in $(seq 1 "$RETRY_COUNT"); do - info "โ„น๏ธ Attempt $attempt/$RETRY_COUNT" + echo "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 - info "๐ŸŸข Rsync completed successfully" + echo "โœ… Rsync completed successfully" break - else - warn "โŒ Rsync failed" - if [[ "$attempt" -lt "$RETRY_COUNT" ]]; then - warn "๐ŸŸก Retrying in $SLEEP seconds..." + else + echo "โŒ Rsync failed" + + if [ "$attempt" -lt "$RETRY_COUNT" ]; then + echo "Retrying in $SLEEP seconds..." sleep "$SLEEP" else - error "๐Ÿ”ด All rsync attempts failed" + echo "๐Ÿ’ฅ All retries failed" start_containers + exit 1 fi fi done - # FINALIZE - info "๐ŸŸก Restarting containers..." + echo "" + echo "๐Ÿ”„ Restarting containers..." start_containers - 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" + echo "" + echo "๐ŸŽ‰ Sync complete!" } main \ No newline at end of file diff --git a/common.sh b/common.sh index 3fe28f6..44baf3a 100644 --- a/common.sh +++ b/common.sh @@ -3,38 +3,50 @@ # ----------------- UNRAID OPS COMMON LIBRARY (CORE FRAMEWORK v1) ------------------------------- # ----------------------------------------------------------------------------------------------- -# OUTPUT HELPERS -info() { echo "[INFO] $*"; } -warn() { echo "[WARN] $*"; } -error() { echo "[ERROR] $*"; exit 1; } -log() { [[ "${ENABLE_LOGGING:-false}" == true ]] && echo "[LOG] $*"; } +# ----------------------------- Output Helpers ----------------------------- +info() { + echo "[INFO] $*" +} -# DEFAULT FLAGS -DRY_RUN=${DRY_RUN:-false} -ENABLE_LOGGING=${ENABLE_LOGGING:-false} -SHOW_STATUS=${SHOW_STATUS:-false} +warn() { + echo "[WARN] $*" +} -# ARGUMENT PARSER +error() { + echo "[ERROR] $*" +} + +log() { + [[ "$ENABLE_LOGGING" == true ]] && echo "[LOG] $*" +} + +# ----------------------------- Argument Parsing ----------------------------- parse_args() { + DRY_RUN=${DRY_RUN:-false} + ENABLE_LOGGING=${ENABLE_LOGGING:-false} for ARG in "$@"; do - if [[ "$ARG" == *=* ]]; then VAR_NAME="${ARG%%=*}" VAR_VALUE="${ARG#*=}" case "$VAR_NAME" in LOG) - [[ "$VAR_VALUE" == "true" ]] && ENABLE_LOGGING=true - [[ "$VAR_VALUE" == "false" ]] && ENABLE_LOGGING=false - log "Logging set to $ENABLE_LOGGING" + if [[ "$VAR_VALUE" == "true" ]]; then + ENABLE_LOGGING=true + info "Verbose logging enabled" + elif [[ "$VAR_VALUE" == "false" ]]; then + ENABLE_LOGGING=false + else + warn "Invalid value for LOG: $VAR_VALUE (use true/false)" + fi ;; *) if declare -p "$VAR_NAME" &>/dev/null; then printf -v "$VAR_NAME" '%s' "$VAR_VALUE" - log "Override $VAR_NAME -> $VAR_VALUE" + log "Overriding $VAR_NAME -> $VAR_VALUE" else - warn "Unknown variable: $VAR_NAME" + warn "Unknown variable $VAR_NAME, ignoring." fi ;; esac @@ -43,46 +55,52 @@ parse_args() { case "$ARG" in --dry-run|-n) DRY_RUN=true - info "Dry-run enabled" + info "Dry-run mode enabled" ;; --log) ENABLE_LOGGING=true - info "Logging enabled" + info "Verbose logging enabled" ;; --no-log) ENABLE_LOGGING=false ;; --status|--summary) SHOW_STATUS=true + ;; ;; --help|-h) - echo "Usage: script [--dry-run|-n] [--log] [--status] [VAR=value]" + echo "Usage: script [--dry-run|-n] [--log] [LOG=true] [VAR=value ...]" exit 0 ;; *) - warn "Unknown argument: $ARG" + warn "Unknown argument $ARG" ;; esac fi done } -# VALIDATION +# ----------------------------- Validation ----------------------------- require_var() { local var="$1" - [[ -z "${!var:-}" ]] && error "Missing required variable: $var" + if [[ -z "${!var:-}" ]]; then + error "Required variable $var is not set." + exit 1 + fi } validate_int() { local name="$1" local value="$2" - [[ ! "${value:-}" =~ ^[0-9]+$ ]] && error "$name must be an integer" + if ! [[ "${value:-}" =~ ^[0-9]+$ ]]; then + error "$name must be a non-negative integer." + exit 1 + fi } -# HOST DETECTION +# ----------------------------- Host Detection ----------------------------- detect_hosts() { - LOCAL_HOSTNAME="$(hostname)" if [[ "$LOCAL_HOSTNAME" == "$HOST1" ]]; then @@ -92,104 +110,127 @@ detect_hosts() { LOCAL_SERVER_NAME="$HOST2" REMOTE_SERVER_NAME="$HOST1" else - error "Unknown host: $LOCAL_HOSTNAME" + error "Local hostname ($LOCAL_HOSTNAME) not recognized." + exit 1 fi - declare -gA SSH_KEYS - + declare -A SSH_KEYS SSH_KEYS["$HOST1|$HOST2"]="$HOST1_SSH_KEY" SSH_KEYS["$HOST2|$HOST1"]="$HOST2_SSH_KEY" KEY_ID="$LOCAL_SERVER_NAME|$REMOTE_SERVER_NAME" - SSH_KEY="${SSH_KEYS[$KEY_ID]:-}" + SSH_KEY="${SSH_KEYS[$KEY_ID]}" - [[ -z "$SSH_KEY" ]] && error "Missing SSH key for $KEY_ID" + if [[ -z "$SSH_KEY" ]]; then + error "No SSH key defined for $LOCAL_SERVER_NAME โ†’ $REMOTE_SERVER_NAME" + exit 1 + fi - log "Host mapping: $LOCAL_SERVER_NAME -> $REMOTE_SERVER_NAME" + info "Local: $LOCAL_SERVER_NAME โ†’ Remote: $REMOTE_SERVER_NAME" + log "SSH key: $SSH_KEY" } -# REMOTE RESOLUTION +# ----------------------------- Remote IP ----------------------------- resolve_remote_ip() { - - log "Resolving remote IP..." + log "Resolving Tailscale IP for $REMOTE_SERVER_NAME..." REMOTE_SERVER=$(tailscale ip -4 "$REMOTE_SERVER_NAME" 2>/dev/null) - [[ -z "$REMOTE_SERVER" ]] && error "Failed to resolve IP for $REMOTE_SERVER_NAME" + if [[ -z "$REMOTE_SERVER" ]]; then + error "Could not resolve Tailscale IP for $REMOTE_SERVER_NAME" + exit 1 + fi - log "Remote IP: $REMOTE_SERVER" + info "Remote IP: $REMOTE_SERVER" } +# ----------------------------- Connectivity ----------------------------- check_remote_online() { + log "Pinging $REMOTE_SERVER..." ping -c 1 "$REMOTE_SERVER" &>/dev/null } -# SAFE SSH WRAPPER -ssh_exec() { - ssh -i "$SSH_KEY" root@"$REMOTE_SERVER" "$@" -} - -# CONTAINER CONTROL -RUNNING_CONTAINERS=() +# ----------------------------- Containers ----------------------------- +declare -a RUNNING_CONTAINERS=() stop_containers() { + if [[ ${#CRITICAL_CONTAINER_NAMES[@]} -eq 0 ]]; then + log "No containers defined to stop" + return + fi - [[ ${#CRITICAL_CONTAINER_NAMES[@]:-0} -eq 0 ]] && return - + info "Stopping containers on $REMOTE_SERVER_NAME..." RUNNING_CONTAINERS=() for container in "${CRITICAL_CONTAINER_NAMES[@]}"; do + log "Checking container: $container" - STATUS=$(ssh_exec "docker inspect -f '{{.State.Running}}' $container 2>/dev/null" || echo "false") + STATUS=$(ssh -i "$SSH_KEY" root@"$REMOTE_SERVER" \ + "docker inspect -f '{{.State.Running}}' $container 2>/dev/null" || echo "false") if [[ "$STATUS" == "true" ]]; then info "Stopping $container" RUNNING_CONTAINERS+=("$container") - ssh_exec "docker stop $container" || warn "Failed to stop $container" + ssh -i "$SSH_KEY" root@"$REMOTE_SERVER" "docker stop $container" + else + log "$container 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 on $REMOTE_SERVER_NAME..." for container in "${RUNNING_CONTAINERS[@]}"; do - - if [[ " ${DELAYED_CONTAINERS[*]:-} " == *" $container "* ]]; then - info "Delaying $container ($CONTAINER_DELAY s)" + if [[ " ${DELAYED_CONTAINERS[*]} " == *" $container "* ]]; then + info "Delaying $container (${CONTAINER_DELAY}s)" sleep "$CONTAINER_DELAY" fi info "Starting $container" - ssh_exec "docker start $container" || warn "Failed to start $container" + ssh -i "$SSH_KEY" root@"$REMOTE_SERVER" "docker start $container" done } -# RSYNC OPTS +# ----------------------------- Rsync Options ----------------------------- get_rsync_opts() { - if [[ -n "${PROFILE_RSYNC_OPTS[$PROFILE_NAME]:-}" ]]; then - IFS=' ' read -r -a RSYNC_OPTS <<< "${PROFILE_RSYNC_OPTS[$PROFILE_NAME]}" - log "Using profile rsync opts" + read -r -a RSYNC_OPTS <<< "${PROFILE_RSYNC_OPTS[$PROFILE_NAME]}" + log "Using profile rsync options: ${PROFILE_RSYNC_OPTS[$PROFILE_NAME]}" else - RSYNC_OPTS=("${DEFAULT_RSYNC_OPTS[@]:-}") - log "Using default rsync opts" + RSYNC_OPTS=("${DEFAULT_RSYNC_OPTS[@]}") + log "Using default rsync options: ${DEFAULT_RSYNC_OPTS[*]}" fi } -# STATUS OUTPUT +# ----------------------------- Status Output ----------------------------- show_status() { - + echo "===== RSYNC STATUS =====" + echo "Local: $LOCAL_SERVER_NAME" + echo "Remote: $REMOTE_SERVER_NAME" + echo "Remote IP: $REMOTE_SERVER" + echo "SSH Key: $SSH_KEY" echo - echo "==================================================" - echo " RSYNC OPS STATUS" - echo "--------------------------------------------------" - echo " Local: $LOCAL_SERVER_NAME" - echo " Remote: $REMOTE_SERVER_NAME" - echo " IP: ${REMOTE_SERVER:-unset}" - echo " Dry Run: $DRY_RUN" - echo " Logging: $ENABLE_LOGGING" - echo " Profile: ${PROFILE_NAME:-default}" - echo "==================================================" + echo "Directory: $DIRECTORY" + echo "Profile: $PROFILE_NAME" + echo + echo "Max Procs: $MAX_RSYNC_PROCS" + echo "Bandwidth: $BW_LIMIT KB/s" + echo "Retries: $RETRY_COUNT" + echo "Sleep: $SLEEP" + echo "Dry Run: $DRY_RUN" + echo + echo "Containers: ${CRITICAL_CONTAINER_NAMES[*]:-(none)}" + echo "Delayed: ${DELAYED_CONTAINERS[*]:-(none)}" + echo + echo "Excludes: ${EXCLUDE_DIRS[*]:-(none)}" + echo + echo "Rsync Opts:" + printf ' %s\n' "${RSYNC_OPTS[@]}" + echo "=========================" } \ No newline at end of file