chore: more attempts to handle shutdown across arch

Author: samrose

nix/tools/dbmate-tool.sh.in

@@ -29,16 +29,18 @@ cleanup() {
         fi
 
         # Wait for Overmind to fully shut down
-        max_wait=10
+        max_wait=30  # Increased from 10 to 30 seconds
         count=0
         while [ -S "./.overmind.sock" ] && [ $count -lt $max_wait ]; do
             echo "Waiting for Overmind socket to close (attempt $count/$max_wait)..."
             sleep 1
             count=$((count + 1))
         done
 
+        # Force remove the socket file if it still exists
         if [ -S "./.overmind.sock" ]; then
-            echo "Warning: Overmind socket still exists after waiting"
+            echo "Warning: Overmind socket still exists after waiting, forcefully removing..."
+            rm -f ./.overmind.sock
         else
             echo "Overmind socket closed successfully"
         fi
@@ -48,8 +50,8 @@ cleanup() {
     if pgrep -f "postgres" >/dev/null; then
         echo "Attempting to stop PostgreSQL gracefully..."
 
-        # Try to find the PostgreSQL data directory
-        PGDATA=$(ps aux | grep postgres | grep -v grep | grep -oP '(?<= -D ).*?(?=\s)')
+        # Improved logic to find PostgreSQL data directory
+        PGDATA=$(ps aux | grep postgres | grep -v grep | grep -oP '(?<= -D ).*?(?=\s)' || true)
 
         if [ -n "$PGDATA" ] && [ -d "$PGDATA" ]; then
             # Use pg_ctl for graceful shutdown if available
@@ -58,7 +60,7 @@ cleanup() {
                 "${PSQLBIN}/pg_ctl" -D "$PGDATA" stop -m smart
 
                 # Wait for PostgreSQL to shut down
-                max_wait=30
+                max_wait=60  # Increased from 30 to 60 seconds
                 count=0
                 while pgrep -f "postgres" >/dev/null && [ $count -lt $max_wait ]; do
                     echo "Waiting for PostgreSQL to stop (attempt $count/$max_wait)..."
@@ -77,9 +79,18 @@ cleanup() {
                 sleep 5
             fi
         else
-            echo "Warning: Could not determine PostgreSQL data directory, using signal-based shutdown"
+            echo "Warning: Could not determine PostgreSQL data directory, using enhanced signal-based shutdown"
+            
+            # Enhanced shutdown with multiple signals
             pkill -TERM postgres || true
             sleep 5
+            if pgrep -f "postgres" >/dev/null; then
+                pkill -INT postgres || true
+                sleep 5
+                if pgrep -f "postgres" >/dev/null; then
+                    pkill -KILL postgres || true
+                fi
+            fi
         fi
     fi
 
@@ -100,15 +111,20 @@ cleanup() {
         echo "Warning: Some processes are still running after graceful shutdown attempts:"
         ps aux | grep -E "(postgres|overmind|tmux.*postgresql)" | grep -v grep
 
-        # Last resort: Use SIGINT before SIGKILL
-        echo "Sending SIGINT to remaining processes..."
-        pkill -INT -f "(postgres|overmind|tmux.*postgresql)" || true
+        # More aggressive cleanup
+        echo "Sending SIGTERM to remaining processes..."
+        pkill -TERM -f "(postgres|overmind|tmux.*postgresql)" || true
         sleep 5
 
-        # If processes still remain, use SIGKILL as a final measure
         if ps aux | grep -E "(postgres|overmind|tmux.*postgresql)" | grep -v grep >/dev/null; then
-            echo "Force killing remaining processes..."
-            pkill -KILL -f "(postgres|overmind|tmux.*postgresql)" || true
+            echo "Sending SIGINT to remaining processes..."
+            pkill -INT -f "(postgres|overmind|tmux.*postgresql)" || true
+            sleep 5
+            
+            if ps aux | grep -E "(postgres|overmind|tmux.*postgresql)" | grep -v grep >/dev/null; then
+                echo "Force killing remaining processes..."
+                pkill -KILL -f "(postgres|overmind|tmux.*postgresql)" || true
+            fi
         fi
     fi
 
@@ -124,7 +140,6 @@ cleanup() {
         echo "Cleanup completed successfully"
     fi
 }
-
 # Set up trap for cleanup on script exit
 trap cleanup EXIT INT TERM
 # Function to display help