X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fpostgres%2Ftemplates%2Fbackup_server%2Fpostgres-make-base-backups.erb;h=9e0af3a0a368d68c1f6e2e382e584ed63d82262b;hb=339bfb16e7f5dc36b60844ced0132a68f4698ca6;hp=2a7996e1d842af94b18f6cf68018505c21f56447;hpb=84f3a967c24800eef6e9afebe35c092a6f4d338a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/postgres/templates/backup_server/postgres-make-base-backups.erb b/modules/postgres/templates/backup_server/postgres-make-base-backups.erb
index 2a7996e1d..9e0af3a0a 100755
--- a/modules/postgres/templates/backup_server/postgres-make-base-backups.erb
+++ b/modules/postgres/templates/backup_server/postgres-make-base-backups.erb
@@ -58,7 +58,7 @@ log() {
 format_timedelta() {
     local secs="$1"; shift
     if [ "$secs" -ge 86400 ]; then
-        printf '%dd %02d:%02d:%02d\n' $(($secs/3600/24)) $(($secs/3600%24)) $(($secs/60%60)) $(($secs%60))
+        printf '%d+%02d:%02d:%02d\n' $(($secs/3600/24)) $(($secs/3600%24)) $(($secs/60%60)) $(($secs%60))
     else
         printf '%02d:%02d:%02d\n' $(($secs/3600)) $(($secs/60%60)) $(($secs%60))
     fi
@@ -134,10 +134,10 @@ while read host port username  cluster version; do
                         age_after_min=$((delta - MIN_WAIT_SUCCESS))
                         if [ "$age_after_min" -lt "$rnd_cuttoff" ]; then
                             runme=0
-                            log "Skipping $host:$port $version/$cluster because random computer says wait ($age_after_min < $rnd_cuttoff (< $DELTA_WAIT_SUCCESS)) + $MIN_WAIT_SUCCESS."
+                            log "Skipping $host:$port $version/$cluster because random computer says wait ($(format_timedelta "${age_after_min}") < $(format_timedelta "${rnd_cuttoff}") (< $(format_timedelta "${DELTA_WAIT_SUCCESS}"))) + $(format_timedelta "${MIN_WAIT_SUCCESS}")."
                         else
                             runme=1
-                            log "Planning to run $host:$port $version/$cluster because random computer says so ($age_after_min >= $rnd_cuttoff)."
+                            log "Planning to run $host:$port $version/$cluster because random computer says so ($(format_timedelta "${age_after_min}") >= $(format_timedelta "${rnd_cuttoff}"))."
                         fi
                     fi
                 fi