root/scripts/backup.sh

@@ -571,18 +571,10 @@ fi
 
 ### Dump SQL
 echo -e "${op}${stamp} Dumping mailcow SQL database...${normal}" >> "$logFile"
-docker-compose exec mysql-mailcow mysqldump --default-character-set=utf8mb4 \
+docker-compose exec mysql-mailcow mysqldump --default-character-set=utf8mb4 -u${DBUSER} -p${DBPASS} ${DBNAME} > "$sqlDumpDir/$sqlDumpFile" 2>> "$logFile"
-    -u${DBUSER} -p${DBPASS} ${DBNAME} > "$sqlDumpDir/$sqlDumpFile" \
+## error checking sqldump within the container in a cron-friendly manner is a
-    2>> "$logFile"
+## nightmare, so let's just see if a non-empty file with the expected name was
-dumpResult=$(docker-compose exec -T mysql-mailcow echo "$?")
+## created
-## very mysqldump completed successfully
-if [ "$dumpResult" = "0" ]; then
-    echo -e "${info}${stamp} -- [INFO] mySQLdump completed successfully --" \
-        "${normal}" >> "$logFile"
-else
-    exitError+=("${stamp}_201")
-fi
-## verify the dump file was actually written to disk
 checkExist fs "$sqlDumpDir/$sqlDumpFile"
     checkResult="$?"
     if [ "$checkResult" = "0" ]; then
@@ -593,16 +585,16 @@ checkExist fs "$sqlDumpDir/$sqlDumpFile"
     fi
 
 ### Save redis state
-## Delete any existing redis dump file otherwise our file check will be useless
+## Delete any existing redis dump file otherwise our check will be useless
 echo -e "${op}${stamp} Cleaning up old redis state backup...${normal}" \
     >> "$logFile"
 checkExist ff "$dockerVolumeRedis/dump.rdb"
     checkResult="$?"
     if [ "$checkResult" = "0" ]; then
-        echo -e "${lit}${stamp} Old redis backup found. ${op}Deleting..." \
+        echo -e "${lit}${stamp} Old redis backup found.${normal}" >> "$logFile"
-            "${normal}" >> "$logFile"
+        echo -e "${op}Deleting...${normal}" >> "$logFile"
         rm -f "$dockerVolumeRedis/dump.rdb" 2>> "$logFile"
-        echo -e "${op}${stamp} ...done${normal}" >> "$logFile"
+        echo -e "${op}${stamp}...done${normal}" >> "$logFile"
     else
         echo -e "${op}${stamp} No old redis backup found${normal}" \
             >> "$logFile"
@@ -610,15 +602,8 @@ checkExist ff "$dockerVolumeRedis/dump.rdb"
 ## Export redis
 echo -e "${op}${stamp} Saving redis state information...${normal}" >> "$logFile"
 docker-compose exec redis-mailcow redis-cli save >> "$logFile" 2>&1
-saveResult=$(docker-compose exec -T redis-mailcow echo "$?")
+## although redis returns an 'OK' if successful, seemingly nothing can test for
-# verify save operation completed successfully
+## this... so let's just verify the dump file was written to disk
-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"
     checkResult="$?"
     if [ "$checkResult" = "0" ]; then