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

Removed err check for sqldump, replaced w/ dumpfile > 0 existance check

Browse Source
This commit is contained in:
Asif Bacchus 2018-10-25 09:12:01 -06:00
parent 93a0cce519
commit 9bd6c9d431
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
root/scripts/backup.sh
View File

@ -565,16 +565,18 @@ fi
### Dump SQL ### Dump SQL
echo -e "${op}${stamp} Dumping mailcow SQL database...${normal}" >> "$logFile" echo -e "${op}${stamp} Dumping mailcow SQL database...${normal}" >> "$logFile"
docker-compose exec mysql-mailcow mysqldump --default-character-set=utf8mb4 -u${DBUSER} -p${DBPASS} ${DBNAME} > "$sqlDumpDir/$sqlDumpFile" 2>> "$logFile" docker-compose exec mysql-mailcow mysqldump --default-character-set=utf8mb4 -u${DBUSER} -p${DBPASS} ${DBNAME} > "$sqlDumpDir/$sqlDumpFile" 2>> "$logFile"
checkResult=$(docker-compose exec -T mysql-mailcow echo $?) ## error checking sqldump within the container in a cron-friendly manner is a
# verify sql dump was successful ## nightmare, so let's just see if a non-empty file with the expected name was
if [ "$checkResult" = 0 ]; then ## created
echo -e "${ok}${stamp} -- [SUCCESS] SQL successfully dumped --${normal}" \ checkExist fs "$sqlDumpDir/$sqlDumpFile"
>> "$logFile" checkResult="$?"
if [ "$checkResult" = "0" ]; then
echo -e "${ok}${stamp} -- [SUCCESS] SQL successfully dumped --" \
"${normal}" >> "$logFile"
else else
exitError+=("${stamp}_201") exitError+=("${stamp}_201")
fi fi
### Save redis state ### Save redis state
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