X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=btrbk-run;h=030107d71834d40589a2951576695f32fec8f6f8;hb=c3d175609e3366d2b9a749efa2b0ca2c3b998887;hp=5c1439824c9ea4dabb17879e83a7859e4a95bbc8;hpb=41b0266eb94d37f2264256897956ba4c1c6a04d6;p=distro-setup

diff --git a/btrbk-run b/btrbk-run
index 5c14398..030107d 100644
--- a/btrbk-run
+++ b/btrbk-run
@@ -85,9 +85,10 @@ rsync-dirs() {
 }
 
 
-pre="${0##*/}:"
-m() { if $verbose; then printf "$pre %s\n"  "$*"; fi;  "$@"; }
-die() { printf "$pre %s\n" "$*" >&2;  exit 1; }
+pre="${0##*/}: "
+m() { if $verbose; then printf "$pre%s\n"  "$*"; fi;  "$@"; }
+e() { printf "$pre%s\n"  "$*"; "$@"; }
+die() { printf "$pre%s\n" "$*" >&2;  exit 1; }
 
 # latest $MAIL_HOST
 if [[ -e /b/bash_unpublished/source-state ]]; then
@@ -167,7 +168,7 @@ if [[ -v targets && $source ]]; then
 fi
 
 if $verbose; then
-  printf "$pre options: conf_only=%s\ndry_run=%s\nrate_limit=%s\nverbose=%s\ncmd_arg=%s" "$conf_only" "$dry_run" "$rate_limit" "$verbose" "$cmd_arg"
+  e "options: conf_only=%s\ndry_run=%s\nrate_limit=%s\nverbose=%s\ncmd_arg=%s" "$conf_only" "$dry_run" "$rate_limit" "$verbose" "$cmd_arg"
 fi
 ### end options parsing
 
@@ -195,7 +196,9 @@ if [[ ! -v targets && ! $source ]]; then
       targets=($home kw)
       ;;
     tp)
-      targets=(frodo kd)
+      # kd disabled temporarily while its hot and i plan to work on it.
+      #targets=(frodo kd)
+      targets=(frodo x3.b8.nz)
       # might not be connected to the vpn
       if timeout -s 9 10 ssh kw :; then
         targets+=(kw)
@@ -254,7 +257,7 @@ else
   esac
   for mp in ${prospective_mps[@]}; do # default mountpoints to sync
     if [[ -e /nocow/btrfs-stale/$mp ]]; then
-      echo "$pre warning: $mp stale, not adding to default mountpoints"
+      e "warning: $mp stale, not adding to default mountpoints"
       continue
     fi
     if awk '{print $2}' /etc/fstab | grep -xF $mp &>/dev/null; then
@@ -287,7 +290,7 @@ if ! $pull_reexec && [[ $source ]] && $pulla ; then
   tmpf=$(mktemp)
   scp $source:/a/bin/distro-setup/btrbk-run $tmpf
   if ! diff -q $tmpf $BASH_SOURCE; then
-    echo "$pre found newer version on host $source. reexecing"
+    e "found newer version on host $source. reexecing"
     install -T $tmpf /usr/local/bin/btrbk-run
     m /usr/local/bin/btrbk-run --pull-reexec "${orig_args[@]}"
     exit
@@ -324,12 +327,17 @@ else
   min_idle_ms=$((1000 * 60 * 15))
   for h in ${targets[@]}; do
     if zone=$(ssh root@$h "mkdir -p /mnt/root/btrbk && date +%z"); then
-      if $cron && DISPLAY=:0 xprintidle; then
-        # This is a separate ssh because xprintidle can fail and thats ok.
-        # Ignore this host. i sometimes use a non-main machine for testing or web browsing, knowing that
-        # everything will be wiped by the next backup, but I dont want it to happen as Im using
-        # it from cronjob.
-        continue
+      # This is a separate ssh because xprintidle can fail and thats ok.
+      if $cron && idle_ms=$(ssh $h DISPLAY=:0 xprintidle); then
+        if (( idle_ms < min_idle_ms )); then
+
+          # Ignore this host. i sometimes use a non-main machine for
+          # testing or web browsing, knowing that everything will be wiped
+          # by the next backup, but I dont want it to happen as Im using
+          # it from cronjob.
+          e "warning: $h: active X session in the last 15 minutes, skipping for now"
+          continue
+        fi
       fi
       sshable+=($h)
       if [[ $zone != $local_zone ]]; then
@@ -344,7 +352,7 @@ else
   else
     if [[ $sshfail ]]; then
       ret=1
-      echo "$pre error: failed to ssh to ${sshfail[*]} but continuing with other hosts"
+      e "error: failed to ssh to ${sshfail[*]} but continuing with other hosts"
     fi
     targets=(${sshable[@]})
   fi