Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-11-15 02:42:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Only run VACUUM on "full" gravity runs

Browse source 
Signed-off-by: DL6ER <dl6er@dl6er.de>
This commit is contained in:
DL6ER 2019-02-03 16:44:05 +01:00
parent 93f1859bab
commit fc62cf7e2f
No known key found for this signature in database
GPG key ID: FB60471F0575164A
1 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
gravity.sh
View file

@ -39,6 +39,7 @@ VPNList="/etc/openvpn/ipp.txt"
piholeGitDir="/etc/.pihole"
gravityDBfile="${piholeDir}/gravity.db"
gravityDBschema="${piholeGitDir}/advanced/Templates/gravity.db.schema"
optimize_database=true
domainsExtension="domains"
matterAndLight="${basename}.0.matterandlight.txt"
@ -685,17 +686,19 @@ gravity_Cleanup() {
echo -e "${OVER} ${TICK} ${str}"
str="Optimizing domains database"
echo -ne " ${INFO} ${str}..."
# Store
output=$( { sqlite3 "${gravityDBfile}" <<< "VACUUM;"; } 2>&1 )
status="$?"
if ${optimize_database} ; then
str="Optimizing domains database"
echo -ne " ${INFO} ${str}..."
# Store
output=$( { sqlite3 "${gravityDBfile}" <<< "VACUUM;"; } 2>&1 )
status="$?"
if [[ "${status}" -ne 0 ]]; then
echo -e "\\n ${CROSS} Unable to optimize gravity database ${gravityDBfile}\\n ${output}"
gravity_Cleanup "error"
else
echo -e "${OVER} ${TICK} ${str}"
if [[ "${status}" -ne 0 ]]; then
echo -e "\\n ${CROSS} Unable to optimize gravity database ${gravityDBfile}\\n ${output}"
gravity_Cleanup "error"
else
echo -e "${OVER} ${TICK} ${str}"
fi
fi
# Only restart DNS service if offline
@ -726,9 +729,9 @@ for var in "$@"; do
"-f" | "--force" ) forceDelete=true;;
"-h" | "--help" ) helpFunc;;
"-sd" | "--skip-download" ) skipDownload=true;;
"-b" | "--blacklist-only" ) listType="blacklist";;
"-w" | "--whitelist-only" ) listType="whitelist";;
"-wild" | "--wildcard-only" ) listType="wildcard"; dnsRestartType="restart";;
"-b" | "--blacklist-only" ) listType="blacklist"; optimize_database=false;;
"-w" | "--whitelist-only" ) listType="whitelist"; optimize_database=false;;
"-wild" | "--wildcard-only" ) listType="wildcard"; optimize_database=false; dnsRestartType="restart";;
esac
done