From 210a6df836f4fc0bcc500fdb5058ddde3201d754 Mon Sep 17 00:00:00 2001 From: Lionel Coupouchetty-Ramouchetty Date: Tue, 25 Feb 2020 22:07:47 +0100 Subject: [PATCH] feat: fail backup if check is not okay --- conf/backup_method.j2 | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/conf/backup_method.j2 b/conf/backup_method.j2 index 7719e28..cccf072 100644 --- a/conf/backup_method.j2 +++ b/conf/backup_method.j2 @@ -33,13 +33,18 @@ do_backup() { current_date=$(date +"%d_%m_%y_%H:%M") pushd $work_dir $RESTIC_COMMAND backup ./ >> $LOGFILE 2>> $ERRFILE - return_code="$?" + backup_return_code="$?" $RESTIC_COMMAND check >> $LOGFILE 2>> $ERRFILE + check_return_code="$?" popd # On ne nettoie que si la sauvegarde s'est bien passee - if [ "$return_code" -eq "0" ];then - $RESTIC_COMMAND forget --keep-daily 7 --keep-weekly 8 --keep-monthly 12 >> $LOGFILE 2>> $ERRFILE + if [ "$backup_return_code" -eq "0" ] && [ "$check_return_code" -eq 0 ];then + $RESTIC_COMMAND forget --keep-daily 7 --keep-weekly 8 --keep-monthly 12 >> $LOGFILE 2>> $ERRFILE + else + [ "$backup_return_code" -ne 0 ] && echo "Something went wrong during backup" >> $ERRFILE + [ "$check_return_code" -ne 0 ] && echo "Repository check did not return 0" >> $ERRFILE + exit 1 fi }