Added Logging

Master.conf

@@ -24,6 +24,10 @@ HOST2="unRAID-Jayred365"
 HOST1_SSH_KEY="/root/.ssh/Gmer4Lfe-rsync-key"
 HOST2_SSH_KEY="/root/.ssh/Jayred365-rsync-key"
 
+# -------------------------- Logging ---------------------------
+ENABLE_LOGGING=false    # true/false to enable script logging
+
+
 #--------------------Rsync Script Defaults-----------------------
 # Network speed limit (KB/s)
 BW_LIMIT=12500

Rsync/rsync.sh

@@ -1,36 +1,16 @@
 #!/bin/bash
 set -e
 
-#-----------------------------------------------------------------------------------------------
-#----------------- User Variables, Please adjust here in Master.conf as needed -----------------
-#-----------------------------------------------------------------------------------------------
-## This is the main Core Rsync script
-#
-# User variables can be adjusted in Master.conf
-# Scripts now just contain runtime logic
-#
-# This allows for profiles and multiple things to use the core script
-# Use arguments in unRAID User Plugin for directory
-# Example: /mnt/user/appdata/unraid_scripts/Rsync/rsync.sh /mnt/user/appdata-test/Arrs/
-#
-# /mnt/user/appdata-test/Arrs/ is the argument
-# If the last name /Arrs/ matches a profile in Master.conf, then profile defaults are used
-# Otherwise, global configuration in Master.conf is used
-#-----------------------------------------------------------------------------------------------
-#----------------- User Variables, Please adjust here in Master.conf as needed -----------------
-#-----------------------------------------------------------------------------------------------
-
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
 # Load configs & helpers
 source "$SCRIPT_DIR/../Master.conf"
 source "$SCRIPT_DIR/../common.sh"
 
 # ----------------------------- Input -----------------------------
 DIRECTORY="$1"
-if [[ -z "$DIRECTORY" ]]; then
+[[ -z "$DIRECTORY" ]] && { log "Usage: $0 <directory-to-sync> [--dry-run] [VAR=value ...]"; exit 1; }
-    echo "Usage: $0 <directory-to-sync> [--dry-run] [VAR=value ...]"
+
-    exit 1
-fi
 shift
 parse_args "$@"
 
@@ -46,62 +26,37 @@ RETRY_COUNT=${PROFILE_RETRY_COUNT[$PROFILE_NAME]:-$RETRY_COUNT}
 SLEEP=${PROFILE_SLEEP[$PROFILE_NAME]:-$SLEEP}
 EXCLUDE_DIRS=(${PROFILE_EXCLUDE_DIRS[$PROFILE_NAME]:-${EXCLUDE_DIRS[@]}})
 
-[[ "$ENABLE_LOGGING" == true ]] && echo "Detected profile: $PROFILE_NAME"
+log "Detected profile: $PROFILE_NAME"
-[[ "$ENABLE_LOGGING" == true ]] && echo "Settings: MAX_RSYNC_PROCS=$MAX_RSYNC_PROCS, BW_LIMIT=$BW_LIMIT, CONTAINERS=${CRITICAL_CONTAINER_NAMES[*]}, EXCLUDES=${EXCLUDE_DIRS[*]}"
+log "Settings: MAX_RSYNC_PROCS=$MAX_RSYNC_PROCS, BW_LIMIT=$BW_LIMIT, CONTAINERS=${CRITICAL_CONTAINER_NAMES[*]}, EXCLUDES=${EXCLUDE_DIRS[*]}, DRY_RUN=$DRY_RUN"
 
 # ----------------------------- Main Sync -----------------------------
-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
-            [[ "$ENABLE_LOGGING" == true ]] && echo "[$LOCAL_SERVER_NAME] Waiting... ($RSYNC_COUNT active rsync processes)"
-            sleep "$SLEEP"
-        else
-            return 0
-        fi
-    done
-    echo "Too many rsync processes, exiting."
-    exit 1
-}
-
 main() {
-    [[ "$ENABLE_LOGGING" == true ]] && echo "[$LOCAL_SERVER_NAME] Syncing $DIRECTORY → $REMOTE_SERVER:$DIRECTORY"
+    log "[$LOCAL_SERVER_NAME] Starting sync: $DIRECTORY → $REMOTE_SERVER:$DIRECTORY"
 
-    for i in $(seq 1 "$RETRY_COUNT"); do
+    [[ $(check_server_online) ]] || { log "Remote $REMOTE_SERVER_NAME unreachable. Exiting."; exit 1; }
-        if ping -c 1 "$REMOTE_SERVER" &>/dev/null; then break; fi
-        echo "Remote $REMOTE_SERVER_NAME down, retrying in $SLEEP seconds..."
-        sleep "$SLEEP"
-    done
-    ping -c 1 "$REMOTE_SERVER" &>/dev/null || { echo "Remote $REMOTE_SERVER_NAME unreachable. Exiting."; exit 1; }
 
     wait_for_rsync
     stop_containers
-    get_rsync_opts
 
+    # Build rsync command
+    get_rsync_opts
     for ex in "${EXCLUDE_DIRS[@]}"; do RSYNC_OPTS+=(--exclude="$ex"); done
-    [ "$DRY_RUN" = true ] && RSYNC_OPTS+=("--dry-run")
+    [[ "$DRY_RUN" == true ]] && RSYNC_OPTS+=("--dry-run")
 
     for attempt in $(seq 1 "$RETRY_COUNT"); do
-        echo "Starting rsync attempt $attempt/$RETRY_COUNT..."
+        log "Starting rsync attempt $attempt/$RETRY_COUNT..."
         if rsync "${RSYNC_OPTS[@]}" -e "ssh -i \"$SSH_KEY\" -T -o Compression=no -o IPQoS=throughput" \
             "$DIRECTORY" "root@${REMOTE_SERVER}:$DIRECTORY"; then
-            echo "Rsync completed successfully."
+            log "Rsync completed successfully."
             break
         else
-            echo "Rsync attempt $attempt failed."
+            log "Rsync attempt $attempt failed."
-            if [ "$attempt" -lt "$RETRY_COUNT" ]; then
+            [[ "$attempt" -lt "$RETRY_COUNT" ]] && { log "Retrying in $SLEEP seconds..."; sleep "$SLEEP"; } || { log "All rsync attempts failed."; start_containers; exit 1; }
-                echo "Retrying in $SLEEP seconds..."
-                sleep "$SLEEP"
-            else
-                echo "All $RETRY_COUNT rsync attempts failed."
-                start_containers
-                exit 1
-            fi
         fi
     done
 
     start_containers
-    [[ "$ENABLE_LOGGING" == true ]] && echo "[$LOCAL_SERVER_NAME] Sync complete."
+    log "[$LOCAL_SERVER_NAME] Sync complete."
 }
 
 main

common.sh

@@ -1,8 +1,13 @@
 #!/bin/bash
 # -----------------------------------------------------------------------------------------------
-# Common Helpers for Unraid Scripts
+# ----------------------- Common Helpers for Unraid Scripts -------------------------------------
 # -----------------------------------------------------------------------------------------------
 
+# ----------------------------- Logging Helper -----------------------------
+log() {
+    [[ "$ENABLE_LOGGING" == true ]] && echo "[$(date '+%Y-%m-%d %H:%M:%S')] $*"
+}
+
 # ----------------------------- Argument Parsing -----------------------------
 parse_args() {
     DRY_RUN=${DRY_RUN:-false}
@@ -12,35 +17,30 @@ parse_args() {
             VAR_VALUE="${ARG#*=}"
             if declare -p "$VAR_NAME" &>/dev/null; then
                 printf -v "$VAR_NAME" '%s' "$VAR_VALUE"
-                [[ "$ENABLE_LOGGING" == true ]] && echo "Overriding $VAR_NAME -> $VAR_VALUE"
+                log "Overriding $VAR_NAME -> $VAR_VALUE"
             else
-                echo "Warning: Unknown variable $VAR_NAME, ignoring."
+                log "Warning: Unknown variable $VAR_NAME, ignoring."
             fi
         else
             case "$ARG" in
                 --dry-run|-n) DRY_RUN=true ;;
                 --help|-h) echo "Usage: script [--dry-run|-n] [VAR=value ...]"; exit 0 ;;
-                *) echo "Warning: Unknown argument $ARG" ;;
+                *) log "Warning: Unknown argument $ARG" ;;
             esac
         fi
     done
 }
 
+# ----------------------------- Validation -----------------------------
 require_var() {
     local var="$1"
-    if [[ -z "${!var:-}" ]]; then
+    [[ -z "${!var:-}" ]] && { log "Error: Required variable $var is not set."; exit 1; }
-        echo "Error: Required variable $var is not set."
-        exit 1
-    fi
 }
 
 validate_int() {
     local name="$1"
     local value="$2"
-    if ! [[ "${value:-}" =~ ^[0-9]+$ ]]; then
+    [[ ! "$value" =~ ^[0-9]+$ ]] && { log "Error: $name must be a non-negative integer."; exit 1; }
-        echo "Error: $name must be a non-negative integer."
-        exit 1
-    fi
 }
 
 # ----------------------------- Host Detection & SSH -----------------------------
@@ -52,7 +52,7 @@ elif [[ "$LOCAL_HOSTNAME" == "$HOST2" ]]; then
     LOCAL_SERVER_NAME="$HOST2"
     REMOTE_SERVER_NAME="$HOST1"
 else
-    echo "Error: Local hostname ($LOCAL_HOSTNAME) not recognized."
+    log "Error: Local hostname ($LOCAL_HOSTNAME) not recognized."
     exit 1
 fi
 
@@ -62,28 +62,23 @@ SSH_KEYS["$HOST2|$HOST1"]="$HOST2_SSH_KEY"
 
 KEY_ID="$LOCAL_SERVER_NAME|$REMOTE_SERVER_NAME"
 SSH_KEY="${SSH_KEYS[$KEY_ID]}"
-if [[ -z "$SSH_KEY" ]]; then
+[[ -z "$SSH_KEY" ]] && { log "Error: No SSH key defined for $LOCAL_SERVER_NAME → $REMOTE_SERVER_NAME"; exit 1; }
-    echo "Error: No SSH key defined for $LOCAL_SERVER_NAME → $REMOTE_SERVER_NAME"
-    exit 1
-fi
 
 # ----------------------------- Remote Server IP -----------------------------
 REMOTE_SERVER=$(tailscale ip -4 "$REMOTE_SERVER_NAME" 2>/dev/null)
-if [[ -z "$REMOTE_SERVER" ]]; then
+[[ -z "$REMOTE_SERVER" ]] && { log "Error: Could not resolve Tailscale IP for $REMOTE_SERVER_NAME"; exit 1; }
-    echo "Error: Could not resolve Tailscale IP for $REMOTE_SERVER_NAME"
+log "Local server: $LOCAL_SERVER_NAME, Remote server: $REMOTE_SERVER_NAME, IP: $REMOTE_SERVER"
-    exit 1
-fi
 
 # ----------------------------- Container Helpers -----------------------------
 declare -a RUNNING_CONTAINERS=()
 
 stop_containers() {
-    [[ "$ENABLE_LOGGING" == true ]] && echo "[$LOCAL_SERVER_NAME] Checking containers on $REMOTE_SERVER_NAME..."
+    log "[$LOCAL_SERVER_NAME] Checking containers on $REMOTE_SERVER_NAME..."
     RUNNING_CONTAINERS=()
     for container in "${CRITICAL_CONTAINER_NAMES[@]}"; do
         STATUS=$(ssh -i "$SSH_KEY" root@"$REMOTE_SERVER" "docker inspect -f '{{.State.Running}}' $container 2>/dev/null" || echo "false")
         if [[ "$STATUS" == "true" ]]; then
-            [[ "$ENABLE_LOGGING" == true ]] && echo "Stopping $container"
+            log "Stopping $container"
             RUNNING_CONTAINERS+=("$container")
             ssh -i "$SSH_KEY" root@"$REMOTE_SERVER" "docker stop $container"
         fi
@@ -91,10 +86,10 @@ stop_containers() {
 }
 
 start_containers() {
-    [[ "$ENABLE_LOGGING" == true ]] && echo "[$LOCAL_SERVER_NAME] Restarting containers on $REMOTE_SERVER_NAME..."
+    log "[$LOCAL_SERVER_NAME] Restarting containers on $REMOTE_SERVER_NAME..."
     for container in "${RUNNING_CONTAINERS[@]}"; do
         if [[ " ${DELAYED_CONTAINERS[*]} " == *" $container "* ]]; then
-            [[ "$ENABLE_LOGGING" == true ]] && echo "Delaying start of $container by ${CONTAINER_DELAY}s..."
+            log "Delaying start of $container by ${CONTAINER_DELAY}s..."
             sleep "$CONTAINER_DELAY"
         fi
         ssh -i "$SSH_KEY" root@"$REMOTE_SERVER" "docker start $container"
@@ -108,4 +103,28 @@ get_rsync_opts() {
     else
         RSYNC_OPTS=("${DEFAULT_RSYNC_OPTS[@]}")
     fi
+}
+
+# ----------------------------- Wait for Rsync -----------------------------
+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
+            log "[$LOCAL_SERVER_NAME] Waiting... ($RSYNC_COUNT active rsync processes)"
+            sleep "$SLEEP"
+        else
+            return 0
+        fi
+    done
+    log "Too many rsync processes, exiting."
+    exit 1
+}
+
+# ----------------------------- Check Server -----------------------------
+check_server_online() {
+    if ping -c 1 "$REMOTE_SERVER" &>/dev/null; then
+        return 0
+    else
+        return 1
+    fi
 }