From e5a004c88cf015c32591c8b29f15fe45adc23af0 Mon Sep 17 00:00:00 2001 From: Asif Bacchus Date: Sat, 20 Oct 2018 05:43:46 -0600 Subject: [PATCH] Changed sqldump and redis save fail from warning to error --- root/scripts/backup.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/root/scripts/backup.sh b/root/scripts/backup.sh index 36504be..3635278 100644 --- a/root/scripts/backup.sh +++ b/root/scripts/backup.sh @@ -268,7 +268,8 @@ xtraFiles=() ### Error codes errorExplain[101]="Could not stop Postfix container. Please check docker logs" errorExplain[102]="Could not stop Dovecot container. Please check docker logs" -errorExplain[200]="Could not dump NextCloud SQL database" +errorExplain[201]="There was a problem dumping the SQL database. It has NOT been backed up" +errorExplain[202]="There was a problem saving redis state information. It has NOT been backed up" errorExplain[210]="Invalid or non-existant borg base directory specified (borg backup details file)" errorExplain[211]="Invalid or non-existant path to borg SSH keyfile (borg backup details file)" errorExplain[212]="Name of borg repo was not specified (borg backup details file)" @@ -276,6 +277,7 @@ errorExplain[215]="Could not find/create 'tmp' directory within borg base direct errorExplain[220]="Borg exited with a critical error. Please check this script's logfile for details" errorExplain[221]="Borg prune exited with ERRORS. Please check this script's logfile for details" + ### Warning codes & messages warningExplain[111]="Could not remove SQL dump file and directory, please remove manually" warningExplain[5030]="Could not remove 503 error page. This MUST be removed manually before NGINX will serve webclients!" @@ -294,8 +296,7 @@ warningExplain[2200]="Borg completed with warnings. Please check this script's l warningExplain[2201]="Borg exited with an unknown return-code. Please check this script's logfile for details" warningExplain[2210]="Borg prune exited with warnings. Please check this script's logfile for details" warningExplain[2212]="Borg prune exited with an unknown return-code. Please check this script's logfile for details" -warningExplain[1001]="There was a problem dumping the SQL database. It has NOT been backed up" -warningExplain[1002]="There was a problem saving redis state information. It has NOT been backed up" + ### Process script parameters @@ -520,7 +521,7 @@ if [ "$checkResult" -eq 0 ]; then echo -e "${ok}${stamp} -- [SUCCESS] SQL successfully dumped --${normal}" \ >> "$logFile" else - exitWarn+=('1001') + exitError+=('201') fi @@ -533,7 +534,7 @@ if [ "$checkResult" -eq 0 ]; then echo -e "${ok}${stamp} -- [SUCCESS] redis state saved --${normal}" \ >> "$logFile" else - exitWarn+=('1002') + exitError+=('202') fi