asif/MailcowBackup
1
0
Fork 0
Code Issues Releases 10 Wiki Activity

Check exitcode from within redis container after cli-save

Browse Source
This commit is contained in:
Asif Bacchus 2018-10-25 13:26:22 -06:00
parent 0808888030
commit 7e92495c94
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
root/scripts/backup.sh
View File

@ -593,16 +593,16 @@ checkExist fs "$sqlDumpDir/$sqlDumpFile"
fi fi
### Save redis state ### Save redis state
## Delete any existing redis dump file otherwise our check will be useless ## Delete any existing redis dump file otherwise our file check will be useless
echo -e "${op}${stamp} Cleaning up old redis state backup...${normal}" \ echo -e "${op}${stamp} Cleaning up old redis state backup...${normal}" \
>> "$logFile" >> "$logFile"
checkExist ff "$dockerVolumeRedis/dump.rdb" checkExist ff "$dockerVolumeRedis/dump.rdb"
checkResult="$?" checkResult="$?"
if [ "$checkResult" = "0" ]; then if [ "$checkResult" = "0" ]; then
echo -e "${lit}${stamp} Old redis backup found.${normal}" >> "$logFile" echo -e "${lit}${stamp} Old redis backup found. ${op}Deleting..." \
echo -e "${op}Deleting...${normal}" >> "$logFile" "${normal}" >> "$logFile"
rm -f "$dockerVolumeRedis/dump.rdb" 2>> "$logFile" rm -f "$dockerVolumeRedis/dump.rdb" 2>> "$logFile"
echo -e "${op}${stamp}...done${normal}" >> "$logFile" echo -e "${op}${stamp} ...done${normal}" >> "$logFile"
else else
echo -e "${op}${stamp} No old redis backup found${normal}" \ echo -e "${op}${stamp} No old redis backup found${normal}" \
>> "$logFile" >> "$logFile"
@ -610,8 +610,15 @@ checkExist ff "$dockerVolumeRedis/dump.rdb"
## Export redis ## Export redis
echo -e "${op}${stamp} Saving redis state information...${normal}" >> "$logFile" echo -e "${op}${stamp} Saving redis state information...${normal}" >> "$logFile"
docker-compose exec redis-mailcow redis-cli save >> "$logFile" 2>&1 docker-compose exec redis-mailcow redis-cli save >> "$logFile" 2>&1
## although redis returns an 'OK' if successful, seemingly nothing can test for saveResult=$(docker-compose exec -T redis-mailcow echo "$?")
## this... so let's just verify the dump file was written to disk # verify save operation completed successfully
if [ "$saveResult" = "0" ]; then
echo -e "${info}${stamp} -- [INFO] redis save-state successful --" \
"${normal}" >> "$logFile"
else
exitError+=("${stamp}_202")
fi
## verify save-file written to disk
checkExist fs "$dockerVolumeRedis/dump.rdb" checkExist fs "$dockerVolumeRedis/dump.rdb"
checkResult="$?" checkResult="$?"
if [ "$checkResult" = "0" ]; then if [ "$checkResult" = "0" ]; then