FailedProxy/Varaverk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added Logging

Browse Source
This commit is contained in:
FailedProxy
2026-03-25 00:30:36 +00:00
parent 4221b8a390
commit 935d06bfa9
3 changed files with 63 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common.sh
+44 -25
View File
@@ -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
echo "Error: Required variable $var is not set."
exit 1
fi
[[ -z "${!var:-}" ]] && { log "Error: Required variable $var is not set."; exit 1; }
}
validate_int() {
local name="$1"
local value="$2"
if ! [[ "${value:-}" =~ ^[0-9]+$ ]]; then
echo "Error: $name must be a non-negative integer."
exit 1
fi
[[ ! "$value" =~ ^[0-9]+$ ]] && { log "Error: $name must be a non-negative integer."; exit 1; }
}
# ----------------------------- 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
echo "Error: No SSH key defined for $LOCAL_SERVER_NAME → $REMOTE_SERVER_NAME"
exit 1
fi
[[ -z "$SSH_KEY" ]] && { log "Error: No SSH key defined for $LOCAL_SERVER_NAME → $REMOTE_SERVER_NAME"; exit 1; }
# ----------------------------- Remote Server IP -----------------------------
REMOTE_SERVER=$(tailscale ip -4 "$REMOTE_SERVER_NAME" 2>/dev/null)
if [[ -z "$REMOTE_SERVER" ]]; then
echo "Error: Could not resolve Tailscale IP for $REMOTE_SERVER_NAME"
exit 1
fi
[[ -z "$REMOTE_SERVER" ]] && { log "Error: Could not resolve Tailscale IP for $REMOTE_SERVER_NAME"; exit 1; }
log "Local server: $LOCAL_SERVER_NAME, Remote server: $REMOTE_SERVER_NAME, IP: $REMOTE_SERVER"
# ----------------------------- 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
}