arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-22 14:58:08 +00:00
Code Issues Releases Wiki Activity

Attempt to restore from all possibly available gravity.db backups

Browse Source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER 2024-11-16 11:52:31 +01:00
parent 59e9bac794
commit a5cb07c76e
No known key found for this signature in database
GPG Key ID: 00135ACBD90B28DD
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gravity.sh
View File

@ -353,10 +353,12 @@ gravity_CheckDNSResolutionAvailable() {
# 0 - If the backup is successfully restored. # 0 - If the backup is successfully restored.
# 1 - If no backup is available or if the restoration fails. # 1 - If no backup is available or if the restoration fails.
try_restore_backup () { try_restore_backup () {
local num
num=$1
# Check if a backup exists # Check if a backup exists
if [ -f "${gravityBCKfile}.1" ]; then if [ -f "${gravityBCKfile}.${num}" ]; then
echo -e " ${INFO} Attempting to restore previous database from backup" echo -e " ${INFO} Attempting to restore previous database from backup"
cp "${gravityBCKfile}.1" "${gravityDBfile}" cp "${gravityBCKfile}.${num}" "${gravityDBfile}"
# If the backup was successfully copied, prepare a new gravity database from # If the backup was successfully copied, prepare a new gravity database from
# it # it
@ -370,14 +372,14 @@ try_restore_backup () {
gravity_Cleanup "error" gravity_Cleanup "error"
fi fi
echo -e " ${TICK} Successfully restored from backup (${gravityBCKfile}.1)" echo -e " ${TICK} Successfully restored from backup (${gravityBCKfile}.${num})"
return 0 return 0
else else
echo -e " ${CROSS} Unable to restore backup" echo -e " ${CROSS} Unable to restore backup no. ${num}"
fi fi
fi fi
echo -e " ${CROSS} No backup available" echo -e " ${CROSS} Backup no. ${num} not available"
return 1 return 1
} }
@ -423,7 +425,14 @@ gravity_DownloadBlocklists() {
echo -e "\\n ${CROSS} Unable to copy data from ${gravityDBfile} to ${gravityTEMPfile}\\n ${output}" echo -e "\\n ${CROSS} Unable to copy data from ${gravityDBfile} to ${gravityTEMPfile}\\n ${output}"
# Try to attempt a backup restore # Try to attempt a backup restore
if ! try_restore_backup; then for i in {1..9}; do
if try_restore_backup "${i}"; then
break
fi
done
# If none of the attempts worked, return 1
if [[ "${i}" -eq 9 ]]; then
return 1 return 1
fi fi