backup-status: Show more information from stamp file

[backup-script.git] / bin / backup-status

diff --git a/bin/backup-status b/bin/backup-status
index c1a09b598132bc0f54d62c7ec59df5bfe0e1e4d4..eb423db01d009707acaa246d8942577e7bffa496 100755 (executable)
--- a/bin/backup-status
+++ b/bin/backup-status
@@ -13,6 +13,7 @@
 NAME=`basename $0`
 PIDFILE="/var/run/backup-script.pid"
 QUICK=0
+ONLY_ERRORS=0
 ONLY_LATEST=0
 
 export LC_ALL=C
@@ -24,7 +25,7 @@ declare -i snapshots=0
 [ -d "/usr/local/etc/backup-script.d" ] \
        && conf_d="/usr/local/etc/backup-script.d" \
        || conf_d="/etc/backup-script.d"
-default_target=""
+default_target="/var/backups"
 default_generations=0
 
 # Search configuration file (last one is used as default!)
@@ -41,8 +42,14 @@ for conf in \
 done
 
 Usage() {
-       echo "Usage: $NAME [-q|--quick] [<system> [<system> [...]]]"
-       echo "       $NAME {-r|--running}"
+       echo "Usage: $NAME [--errors|--latest] [--quick] [<system> [<system> [...]]]"
+       echo "       $NAME --running"
+       echo
+       echo "  --errors, -e    Only show current backups with errors (implies \"--latest\")."
+       echo "  --latest, -l    Only show latest backup generations."
+       echo "  --quick, -q     Don't calculate backup sizes."
+       echo "  --running, -r   Check if an \"backup-script\" task is currently running."
+       echo
        exit 2
 }
 
@@ -61,21 +68,65 @@ Check_Stamp() {
        # $2: padding
 
        if [ -f "$1" ]; then
-               if [ "$(uname)" = "Linux" ]; then
-                       last=`LC_ALL=C stat "$1" | grep "^Modify: " \
-                        | cut -d':' -f2- | cut -d. -f1`
+               declare -i code=-1
+               declare -i start_t=-1
+               start=""
+               declare -i end_t=-1
+               end=""
+               declare -i duration_t=-1
+
+               # Read in "stamp file"
+               source "$1"
+
+               if [ $start_t -gt 0 ] && [ $end_t -gt 0 ]; then
+                       if [ "$(uname)" = "Linux" ]; then
+                               start=$(date -d @"$start_t")
+                               end=$(date -d @"$end_t")
+                       else
+                               start=$(date -r "$start_t")
+                               end=$(date -r "$end_t")
+                       fi
+                       duration_t=$end_t-$start_t
                else
-                       last=`LC_ALL=C stat -f "%Sc" "$1"`
+                       if [ "$(uname)" = "Linux" ]; then
+                               end=`LC_ALL=C stat "$1" | grep "^Modify: " \
+                                | cut -d':' -f2- | cut -d. -f1`
+                       else
+                               end=`LC_ALL=C stat -f "%Sc" "$1"`
+                       fi
                fi
-               [ -n "$last" ] && echo "$2  - Date:" $last
-               code=
-               source "$1"
+               [ -n "$start" ] && echo "$2  - Start date:" $start
+               [ -n "$end" ] && echo "$2  - End date:" $end
+               if [ $duration_t -gt -1 ]; then
+                       declare -i s=$duration_t
+                       if [ $s -ge 60 ]; then
+                               declare -i m=$(($s/60))
+                               declare -i s=$(($s%60))
+                               if [ $m -ge 60 ]; then
+                                       declare -i h=$(($m/60))
+                                       declare -i m=$(($m%60))
+                                       if [ $h -ge 24 ]; then
+                                               declare -i d=$(($h/24))
+                                               declare -i h=$(($h%24))
+                                               duration="${d}d${h}h${m}m${s}s"
+                                       else
+                                               duration="${h}h${m}m${s}s"
+                                       fi
+                               else
+                                       duration="${m}m${s}s"
+                               fi
+                       else
+                               duration="${s}s"
+                       fi
+                       echo "$2  - Duration:" $duration
+               fi
+
                case "$code" in
                  0)    txt=", OK"; ;;
                  24)   txt=", WARNING (some files vanished during backup)"; ;;
                  *)    txt=", ERROR"
                esac
-               [ -n "$code" ] && echo "$2  - Result code: $code$txt"
+               [ $code -gt 0 ] && echo "$2  - Result code: ${code}${txt}"
        else
                echo "$2  - No timestamp recorded! Backup currently running or aborted?"
        fi
@@ -87,6 +138,13 @@ Snapshot_Info() {
        Check_Stamp "$1/.stamp" "  "
 }
 
+Get_Result_Code() {
+       code=1
+       [ -r "$1" ] && source "$1"
+       [ -z "$code" ] && code=1
+       echo $code
+}
+
 if [ "$1" == "-r" -o "$1" == "--running" ]; then
        pid="$(cat "$PIDFILE" 2>/dev/null)"
        if [ -n "$pid" ]; then
@@ -106,6 +164,10 @@ fi
 
 while [ $# -gt 0 ]; do
        case "$1" in
+               "--errors"|"-e")
+                       ONLY_ERRORS=1
+                       ONLY_LATEST=1
+                       ;;
                "--latest"|"-l")
                        ONLY_LATEST=1
                        ;;
@@ -133,8 +195,6 @@ else
        sys="${conf_d}/"*
 fi
 
-[ -r "${conf_d}/backup-script.conf" ] && source "${conf_d}/backup-script.conf"
-
 for f in $sys; do
        [ -r "$f" -a -f "$f" ] || continue
 
@@ -153,10 +213,17 @@ for f in $sys; do
        # Read in system configuration file
        source "$f"
 
-       target="$target/$system"
+       target="$target/$(basename "$f")"
 
        [ -d "$target" ] || continue
 
+       if [ "$ONLY_ERRORS" != "0" ]; then
+               [ $generations -gt 0 ] \
+                       && result=$(Get_Result_Code "$target/latest/.stamp") \
+                       || result=$(Get_Result_Code "$target/.stamp")
+               [ $result -eq 0 -o $result -eq 24 ] && continue
+       fi
+
        # System name
        [ "$system" = "$fname" ] && echo "$fname" || echo "$fname [$system]"
 
@@ -185,12 +252,17 @@ for f in $sys; do
        echo
 done
 
+if [ "$ONLY_ERRORS" != "0" ]; then
+       status="failed "; p0="."; pN="!"
+else
+       status=""; p0="!"; pN="."
+fi
 if [ $count -lt 1 ]; then
-       echo "No backups found!"
+       echo "No ${status}backups found${p0}"
        exit 1
 fi
 [ $count -eq 1 ] && sc="" || sc="s"
 [ $snapshots -eq 1 ] && ss="" || ss="s"
-echo "$count system backup$sc found, $snapshots snapshot$ss."
+echo "$count ${status}system backup$sc found, $snapshots snapshot$ss${pN}"
 
 # -eof-