Updated to version 2.1.1

- Added email delivery of current execution log.
- Added success/failure/interruption notifications and run-specific logs.
- Added automatic cleanup of staging directories on backup failure or interruption.
- Added cleanup_staging() helper function.
- Added CURRENT_STAGING_DIR tracking.
- Added automatic RUN_LOG cleanup during failure and interruption. Improved housekeeping to prevent orphaned staging data after unexpected termination.

AppBackup-restic.sh

@@ -11,7 +11,7 @@
 #   AppBackup-restic.sh --appname <name> --appuser <user> [--apppassword <password>]
 #
 # Author: Charlie Silverman
-# Version: 1.6
+# Version: 1.7
 #
 # Revision History:
 #   1.0 - Initial version.
@@ -23,6 +23,8 @@
 #   1.5 - Added command-line help.
 #   1.6 - Replaced positional parameters with named command-line options
 #         and added support for short/long option formats.
+#   1.7 - Added email delivery of current execution log on success,
+#         failure, or interruption.
 #
 
 set -o errexit
@@ -37,7 +39,7 @@ show_help() {
 
 cat << EOF
 
-AppBackup-restic.sh v1.6
+AppBackup-restic.sh v1.7
 
 DESCRIPTION
     Creates a backup of a web application's files and optionally its
@@ -46,7 +48,8 @@ DESCRIPTION
 
 USAGE
 
-    AppBackup-restic.sh --appname <name> --appuser <user> [--apppassword <password>]
+    AppBackup-restic.sh --appname <name> --appuser <user>
+                        [--apppassword <password>]
 
 OPTIONS
 
@@ -76,9 +79,22 @@ EXAMPLES
         -a CustomerPortal \
         -u portaluser
 
-LOG FILE
+LOG FILES
 
-    /tmp/AppBackup-<ApplicationName>.log
+    Historical Log:
+        /tmp/AppBackup-<ApplicationName>.log
+
+    Current Run Log:
+        /tmp/AppBackup-<ApplicationName>-YYYYMMDD_HHMMSS.log
+
+EMAIL NOTIFICATIONS
+
+    Current execution logs are emailed to:
+
+        ackitsme3@gmail.com
+
+    Success, failure, and interruption events each generate
+    a separate email.
 
 AUTHOR
 
@@ -86,7 +102,7 @@ AUTHOR
 
 VERSION
 
-    1.6
+    1.7
 
 EOF
 
@@ -171,13 +187,44 @@ HOSTNAME_FQDN="$(hostname -f)"
 SAFE_APPNAME=$(echo "$AppName" | tr -cs '[:alnum:]_-' '_')
 
 LOGFILE="/tmp/AppBackup-${SAFE_APPNAME}.log"
+RUNLOG="/tmp/AppBackup-${SAFE_APPNAME}-${DATE}.log"
+
+touch "$RUNLOG"
 
 #------------------------------------------------------------------------------
 # Logging Function
 #------------------------------------------------------------------------------
 
 log() {
-    echo "$(date '+%Y-%m-%d %H:%M:%S') [$$] $1" | tee -a "$LOGFILE"
+
+    local msg
+
+    msg="$(date '+%Y-%m-%d %H:%M:%S') [$$] $1"
+
+    echo "$msg" | tee -a "$RUNLOG"
+}
+
+#------------------------------------------------------------------------------
+# Email Function
+#------------------------------------------------------------------------------
+
+send_email_log() {
+
+    local subject="$1"
+
+    if command -v mailx >/dev/null 2>&1; then
+
+        mailx -s "$subject" ackitsme3@gmail.com < "$RUNLOG"
+
+    elif command -v mail >/dev/null 2>&1; then
+
+        mail -s "$subject" ackitsme3@gmail.com < "$RUNLOG"
+
+    else
+
+        log "WARNING: mailx/mail command not found. Email not sent."
+
+    fi
 }
 
 #------------------------------------------------------------------------------
@@ -191,6 +238,9 @@ error_handler() {
 
     log "ERROR: Backup failed on line ${line_number} with exit code ${exit_code}"
 
+    send_email_log \
+        "FAILED: AppBackup ${AppName} (${HOSTNAME_FQDN})"
+
     exit "${exit_code}"
 }
 
@@ -198,6 +248,9 @@ interrupt_handler() {
 
     log "ERROR: Backup interrupted by signal"
 
+    send_email_log \
+        "INTERRUPTED: AppBackup ${AppName} (${HOSTNAME_FQDN})"
+
     exit 1
 }
 
@@ -213,7 +266,8 @@ log "Starting backup job"
 log "Application: $AppName"
 log "Application User: $AppUser"
 log "Host: $HOSTNAME_FQDN"
-log "Log File: $LOGFILE"
+log "Historical Log: $LOGFILE"
+log "Run Log: $RUNLOG"
 log "================================================================="
 
 #------------------------------------------------------------------------------
@@ -277,8 +331,8 @@ fi
 
 log "Removing previous backup archives"
 
-rm -f /home/Backups/"${AppName}"*.tar.bz*
-rm -f /home/Backups/"${HostPrefix}${AppName}"*.tar.bz*
+rm -f /home/Backups/"${AppName}"*.tar.bz* 2>/dev/null || true
+rm -f /home/Backups/"${HostPrefix}${AppName}"*.tar.bz* 2>/dev/null || true
 
 #------------------------------------------------------------------------------
 # Create Archive
@@ -323,7 +377,7 @@ else
         --tag website \
         --tag "$AppName" \
         --tag "$HOSTNAME_FQDN" \
-        >> "$LOGFILE" 2>&1
+        >> "$RUNLOG" 2>&1
 
     log "Restic backup completed successfully"
 
@@ -350,3 +404,24 @@ log "Application: $AppName"
 log "Archive: ${HostPrefix}${ArchiveFile}"
 log "Host: $HOSTNAME_FQDN"
 log "================================================================="
+
+#------------------------------------------------------------------------------
+# Append Current Run Log To Historical Log
+#------------------------------------------------------------------------------
+
+cat "$RUNLOG" >> "$LOGFILE"
+
+#------------------------------------------------------------------------------
+# Email Current Run Log
+#------------------------------------------------------------------------------
+
+send_email_log \
+    "SUCCESS: AppBackup ${AppName} (${HOSTNAME_FQDN})"
+
+#------------------------------------------------------------------------------
+# Cleanup Run Log
+#------------------------------------------------------------------------------
+
+rm -f "$RUNLOG"
+
+exit 0

dockerbackup.sh

@@ -3,7 +3,7 @@
 ### Docker Stack Backup Script
 ### Created by Charlie Silverman - ackitsme3@gmail.com
 ###############################################################################
-### Version: 2.0.1
+### Version: 2.1.1
 ### Updated: 2026-10-18
 ### Purpose:  Backs up all docker stacks in a given directory to Restic bucket
 ###############################################################################
@@ -29,6 +29,15 @@
 #         creating a single monolithic archive.  This will allow restic to
 #         properly manage snapshots
 # 2.0.1 - Changed exception lookup to case-insensitive
+# 2.1.0 - Added email delivery of current execution log. Added
+#         success/failure/interruption notifications and run-specific logs.
+# 2.1.1 - Added automatic cleanup of staging directories on backup failure
+#         or interruption.
+#         Added cleanup_staging() helper function.
+#         Added CURRENT_STAGING_DIR tracking.
+#         Added automatic RUN_LOG cleanup during failure and interruption.
+#         Improved housekeeping to prevent orphaned staging data after
+#         unexpected termination.
 
 set -Eeuo pipefail
 
@@ -38,21 +47,41 @@ set -Eeuo pipefail
 
 COMPOSE_ROOT="/home/ackitsme/docker"
 LOG_DIR="/home/ackitsme/docker/backuplogs"
+mkdir -p "${LOG_DIR}"
 LOG_FILE="${LOG_DIR}/docker-backup_$(date +%Y%m%d-%H%M%S).log"
 
 # Restic repository configuration
-export RESTIC_REPOSITORY="s3:https://s3.us-west-004.backblazeb2.com/ackitsbucket/docker"
 export RESTIC_ENV_FILE="/root/.restic-env"
 
 # Load Restic environment
-source $RESTIC_ENV_FILE
+source "$RESTIC_ENV_FILE"
 
 HOSTNAME_SHORT="$(hostname -s)"
 TIMESTAMP="$(date +%Y%m%d-%H%M%S)"
 
+RUN_LOG="${LOG_DIR}/docker-backup_run_${TIMESTAMP}.log"
+CURRENT_STAGING_DIR=""
+
+touch "${RUN_LOG}"
+
+###############################################################################
+# Verify Requirements
+###############################################################################
+
+for cmd in docker restic tar gzip jq; do
+    command -v "$cmd" >/dev/null 2>&1 || {
+        echo "Missing required command: $cmd"
+        exit 1
+    }
+done
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
 # Load exceptions, if any
-if [ -f "dockerbackup-exception.list" ]; then
-   mapfile -t SKIP_PROJECTS < dockerbackup-exception.list
+if [ -f "${SCRIPT_DIR}/dockerbackup-exception.list" ]; then
+    mapfile -t SKIP_PROJECTS < "${SCRIPT_DIR}/dockerbackup-exception.list"
+else
+    SKIP_PROJECTS=()
 fi
 
 
@@ -62,10 +91,13 @@ fi
 
 ## Log to screen and log file
 log() {
-   local message="[$(date '+%F %T')] $*"
+	local message
+	message="[$(date '+%F %T')] $*"
 
-   echo "$message"
-   echo "$message" >> "$LOG_FILE"
+    echo "$message"
+
+    echo "$message" >> "$LOG_FILE"
+    echo "$message" >> "$RUN_LOG"
 }
 
 ## Check if specified project is in the exception list
@@ -76,46 +108,109 @@ should_skip() {
 
     for pattern in "${SKIP_PROJECTS[@]}"; do
         if [[ "$project" == $pattern ]]; then
+            shopt -u nocasematch
             return 0
         fi
     done
 
     shopt -u nocasematch
-
     return 1
 }
 
-## Check if docker container is running
-is_container_running() {
-    local container_name="$1"
-
-    docker inspect -f '{{.State.Running}}' "$container_name" 2>/dev/null | grep -q '^true$'
-}
-
 ## Restart composer stack
 restart_stack() {
-
     local compose_dir="$1"
 
     log "Restarting stack: ${compose_dir}"
 
-    (
-        sudo -u ackitsme docker compose up -d
-        su - ackitsme -c "cd ${compose_dir};docker compose up -d"
+    su - ackitsme -c \
+        "cd '${compose_dir}' && docker compose up -d" \
+        || log "WARNING: Failed to restart stack ${compose_dir}"
+}
 
-    ) || log "WARNING: Failed to restart stack ${compose_dir}"
+## Send E-mail Notification
+send_email_log() {
+    local subject="$1"
+
+    if command -v mailx >/dev/null 2>&1; then
+
+        mailx -s "$subject" \
+            ackitsme3@gmail.com < "$RUN_LOG"
+
+    elif command -v mail >/dev/null 2>&1; then
+
+        mail -s "$subject" \
+            ackitsme3@gmail.com < "$RUN_LOG"
+
+    else
+
+        log "WARNING: mail/mailx command not found. Email not sent."
+
+    fi
+}
+
+## Cleanup Function
+cleanup_staging() {
+
+    if [[ -n "${CURRENT_STAGING_DIR:-}" ]] && \
+       [[ -d "${CURRENT_STAGING_DIR}" ]]; then
+
+        log "Cleaning up staging directory: ${CURRENT_STAGING_DIR}"
+
+        rm -rf "${CURRENT_STAGING_DIR}" || \
+            log "WARNING: Failed to remove ${CURRENT_STAGING_DIR}"
+
+    fi
+}
+
+## Error Handler
+error_handler() {
+    local exit_code=$?
+
+    trap - ERR
+
+    local line_number=$1
+
+    log "ERROR: Backup failed on line ${line_number} (exit code ${exit_code})"
+
+    cleanup_staging
+
+    send_email_log \
+        "FAILED: Docker Backup (${HOSTNAME_SHORT})"
+
+    rm -f "${RUN_LOG}"
+
+    exit "${exit_code}"
+}
+
+## Interrupt Handler
+interrupt_handler() {
+	trap - SIGINT SIGTERM
+
+    log "ERROR: Backup interrupted"
+
+    cleanup_staging
+
+    send_email_log \
+        "INTERRUPTED: Docker Backup (${HOSTNAME_SHORT})"
+
+	rm -f "${RUN_LOG}"
+
+    exit 1
 }
 
 ###############################################################################
-# Verify Requirements
+# Trap Handlers
 ###############################################################################
+trap 'error_handler $LINENO' ERR
+trap interrupt_handler SIGINT SIGTERM
 
-for cmd in docker restic tar gzip; do
-    command -v "$cmd" >/dev/null 2>&1 || {
-        echo "Missing required command: $cmd"
-        exit 1
-    }
-done
+log "===================================================="
+log "Docker Backup Starting"
+log "Host: ${HOSTNAME_SHORT}"
+log "Historical Log: ${LOG_FILE}"
+log "Run Log: ${RUN_LOG}"
+log "===================================================="
 
 ###############################################################################
 # Locate Compose Files
@@ -132,6 +227,11 @@ mapfile -t COMPOSE_FILES < <(
 
 if [ "${#COMPOSE_FILES[@]}" -eq 0 ]; then
     log "No compose files found."
+
+    send_email_log \
+        "Docker Backup - No Compose Files (${HOSTNAME_SHORT})"
+
+    rm -f "${RUN_LOG}"
     exit 0
 fi
 
@@ -139,7 +239,7 @@ fi
 # Process Each Compose Project
 ###############################################################################
 
-total_size=0
+total_size=0.00
 
 for compose_file in "${COMPOSE_FILES[@]}"; do
 
@@ -157,6 +257,7 @@ for compose_file in "${COMPOSE_FILES[@]}"; do
     log "=================================================="
 
     STAGING_DIR="/home/Backups/docker-backup-${project_name}"
+	CURRENT_STAGING_DIR="${STAGING_DIR}"
 
     mkdir -p \
         "${STAGING_DIR}/images" \
@@ -219,17 +320,15 @@ for compose_file in "${COMPOSE_FILES[@]}"; do
     log "Backing up images..."
 
     while read -r image; do
-
         [ -z "$image" ] && continue
 
         if docker image inspect "$image" >/dev/null 2>&1; then
-
             safe_name=$(echo "$image" | sed 's#[/:]#_#g')
 
             log "Saving image: $image"
 
-                        docker save "$image" \
-                                > "${STAGING_DIR}/images/${safe_name}.tar"
+			docker save "$image" \
+				> "${STAGING_DIR}/images/${safe_name}.tar"
         fi
 
     done < "${STAGING_DIR}/metadata/images.list"
@@ -241,7 +340,6 @@ for compose_file in "${COMPOSE_FILES[@]}"; do
     log "Backing up volumes..."
 
     while read -r volume; do
-
         [ -z "$volume" ] && continue
 
         log "Saving volume: $volume"
@@ -292,9 +390,11 @@ for compose_file in "${COMPOSE_FILES[@]}"; do
     ###################################################
     # Get backup size
     ###################################################
-        lastsnap=`restic ls latest`
-        lastsnapid=$(echo "$lastsnap" | awk '{print $2}')
-        snapdata=`restic snapshots $lastsnapid`
+#        lastsnap=$(restic ls latest)
+#        lastsnapid=$(echo "$lastsnap" | awk '{print $2}')
+		lastsnapid=$(restic snapshots --json | jq -r '.[-1].short_id')
+#		lastsnapid=$(restic snapshots latest --compact | awk 'NR==3 {print $1}')
+        snapdata=$(restic snapshots "$lastsnapid")
         snapnum=$(echo $snapdata | awk '{print $14}')
         snapsu=$(echo $snapdata | awk '{print $15}')
         case "$snapsu" in
@@ -312,6 +412,7 @@ for compose_file in "${COMPOSE_FILES[@]}"; do
     ###################################################
 
     rm -rf "${STAGING_DIR}"
+	CURRENT_STAGING_DIR=""
 
     log "Project complete: ${project_name} ${snapnum} GiB"
     log ""
@@ -332,3 +433,9 @@ restic forget \
 
 log "All compose projects backed up successfully."
 log "Total Backup Size: $total_size GiB"
+
+send_email_log \
+    "SUCCESS: Docker Backup (${HOSTNAME_SHORT})" || \
+    log "WARNING: Unable to send success email."
+	
+rm -f "${RUN_LOG}"