Optimize gravity database before asking FTL to reload to avoid race-collisions on slow(er) devices

Signed-off-by: DL6ER <dl6er@dl6er.de>

gravity.sh

@@ -702,6 +702,21 @@ gravity_Trap() {
   trap '{ echo -e "\\n\\n  ${INFO} ${COL_LIGHT_RED}User-abort detected${COL_NC}"; gravity_Cleanup "error"; }' INT
 }
 
+gravity_Optimize() {
+  str="Optimizing domains database"
+  echo -ne "  ${INFO} ${str}..."
+  # Run VACUUM command on database to optimize it
+  output=$( { sqlite3 "${gravityDBfile}" "VACUUM;"; } 2>&1 )
+  status="$?"
+
+  if [[ "${status}" -ne 0 ]]; then
+    echo -e "\\n  ${CROSS} Unable to optimize gravity database ${gravityDBfile}\\n  ${output}"
+    error="error"
+  else
+    echo -e "${OVER}  ${TICK} ${str}"
+  fi
+}
+
 # Clean up after Gravity upon exit or cancellation
 gravity_Cleanup() {
   local error="${1:-}"
@@ -728,21 +743,6 @@ gravity_Cleanup() {
 
   echo -e "${OVER}  ${TICK} ${str}"
 
-  if ${optimize_database} ; then
-    str="Optimizing domains database"
-    echo -ne "  ${INFO} ${str}..."
-    # Run VACUUM command on database to optimize it
-    output=$( { sqlite3 "${gravityDBfile}" "VACUUM;"; } 2>&1 )
-    status="$?"
-
-    if [[ "${status}" -ne 0 ]]; then
-      echo -e "\\n  ${CROSS} Unable to optimize gravity database ${gravityDBfile}\\n  ${output}"
-      error="error"
-    else
-      echo -e "${OVER}  ${TICK} ${str}"
-    fi
-  fi
-
   # Only restart DNS service if offline
   if ! pgrep pihole-FTL &> /dev/null; then
     "${PIHOLE_COMMAND}" restartdns
@@ -819,6 +819,11 @@ chmod g+w "${piholeDir}" "${gravityDBfile}"
 # Compute numbers to be displayed
 gravity_ShowCount
 
+# Optimize gravity database if requested
+if ${optimize_database} ; then
+  gravity_Optimize
+fi
+
 # Determine if DNS has been restarted by this instance of gravity
 if [[ -z "${dnsWasOffline:-}" ]]; then
   "${PIHOLE_COMMAND}" restartdns reload