commit 65766388e0644f168297ecfcc33e4d66ea5f01f8
author Filip Pytloun <filip.pytloun@tcpcloud.eu> Mon Apr 11 09:20:01 2016 +0200
committer Filip Pytloun <filip.pytloun@tcpcloud.eu> Mon Apr 11 09:20:01 2016 +0200
tree 4616f0b2521c4b8911da64047ca6a2e88c8da105
parent 5191a5756906acd551af7e21a299698092bcb46f
parent 6233fec441536732e332a149306a7c19a71819b1

Merge branch 'sensu' into 'master'

correct date calculations

See merge request !4

backupninja/files/duplicity_salt.sh

diff --git a/backupninja/files/duplicity_salt.sh b/backupninja/files/duplicity_salt.sh
index 4262a6c..e27df44 100644
--- a/backupninja/files/duplicity_salt.sh
+++ b/backupninja/files/duplicity_salt.sh
@@ -17,7 +17,7 @@
     esac
 done
 shift $((OPTIND-1))
-TOL=$2
+TOL=$[$2*3600]
 
 action_prepare() {
     trap action_cleanup INT TERM EXIT
@@ -55,11 +55,11 @@
         exit_critical "duplicity not working correctly"
     fi
 
-    LAST=$(date -d "$(echo ${dup_status[@]} | sed -n -e 's/^.*Chain end time: //p' | awk '{print $1,$2,$3,$4,$5}')" +"%Y%m%d%H")
-    TODATE=$(date +"%Y%m%d%H")
+    LAST=$(date -d "$(echo ${dup_status[@]} | sed -n -e 's/^.*Chain end time: //p' | awk '{print $1,$2,$3,$4,$5}')" +"%s")
+    TODATE=$(date +"%s")
 
     if [ $[TODATE-$TOL] -gt $LAST ]; then
-        exit_critical "Last backup $[TODATE-$LAST] hours ago."
+        exit_critical "Last backup $[(TODATE-LAST)/3600] hours ago."
     else
         exit_ok "Last backup: $LAST"
     fi