chore: try to have migrations check just use start-server directly

Author: samrose

nix/tools/dbmate-tool.sh.in

@@ -15,39 +15,36 @@ CURRENT_SYSTEM="@CURRENT_SYSTEM@"
 ANSIBLE_VARS="@ANSIBLE_VARS@"
 PGBOUNCER_AUTH_SCHEMA_SQL=@PGBOUNCER_AUTH_SCHEMA_SQL@
 STAT_EXTENSION_SQL=@STAT_EXTENSION_SQL@
+PG_PID=""
+
 # Cleanup function
 cleanup() {
     echo "Cleaning up..."
 
-    # Kill postgres processes first
-    if pgrep -f "postgres" >/dev/null; then
-        pkill -TERM postgres || true
+    # Kill postgres process using PG_PID if available
+    if [ -n "$PG_PID" ]; then
+        echo "Stopping PostgreSQL (PID: $PG_PID)..."
+        kill -TERM "$PG_PID" || true
         sleep 2
     fi
-
-    # Then kill overmind
-    if [ -S "./.overmind.sock" ]; then
-        overmind kill || true
+    
+    # Kill any remaining postgres processes
+    if pgrep -f "postgres" >/dev/null; then
+        pkill -TERM postgres || true
         sleep 2
+        # Force kill any remaining postgres processes
+        pkill -9 -f "postgres" || true
     fi
 
-    # Kill tmux sessions explicitly
-    pkill -f "tmux.*overmind.*postgresql" || true
-    tmux ls 2>/dev/null | grep 'overmind' | cut -d: -f1 | xargs -I{} tmux kill-session -t {} || true
-
-    # Force kill any stragglers
-    pkill -9 -f "(postgres|tmux.*overmind.*postgresql)" || true
-    
-    rm -f .overmind.sock Procfile
-
     # Final verification
-    if ps aux | grep -E "(postgres|overmind|tmux.*postgresql)" | grep -v grep >/dev/null; then
-        ps aux | grep -E "(postgres|overmind|tmux.*postgresql)" | grep -v grep
+    if ps aux | grep -f "postgres" | grep -v grep >/dev/null; then
+        ps aux | grep -f "postgres" | grep -v grep
         return 1
     fi
 }
 
 # Set up trap for cleanup on script exit
+trap cleanup EXIT
 
 # Function to display help
 print_help() {
@@ -175,62 +172,42 @@ trim_schema() {
         ;;
     esac
 }
-overmind_start() {
-        cat > Procfile << EOF
-postgres_${PSQL_VERSION}: exec nix run "$FLAKE_URL#start-server" -- "$PSQL_VERSION" --skip-migrations
-EOF
-    overmind start -D
-    echo "Waiting for overmind socket..."
-    max_wait=5
-    count=0
-    while [ $count -lt $max_wait ]; do
-        if [ -S "./.overmind.sock" ]; then
-            # Found the socket, give it a moment to be ready
-            sleep 5
-            echo "Socket file found and ready"
-            break
-        fi
-        echo "Waiting for socket file (attempt $count/$max_wait)"
-        sleep 1
-        count=$((count + 1))
-    done
-}
-perform_dump() {
-    local max_attempts=3
-    local attempt=1
-    
-    while [ $attempt -le $max_attempts ]; do
-        echo "Attempting dbmate dump (attempt $attempt/$max_attempts)"
-        
-        if dbmate dump; then
-            return 0
-        fi
-        
-        echo "Dump attempt $attempt failed, waiting before retry..."
-        sleep 5
-        attempt=$((attempt + 1))
-    done
-    
-    echo "All dump attempts failed"
-    return 1
+
+# Start postgres function
+start_postgres() {
+    echo "Starting PostgreSQL server version $PSQL_VERSION..."
+    nix run "$FLAKE_URL#start-server" -- "$PSQL_VERSION" --skip-migrations &
+    PG_PID=$!
+    echo "PostgreSQL started with PID: $PG_PID"
+
+    # Give postgres a moment to start
+    sleep 2
+
+    # Check if process is still running
+    if ! kill -0 "$PG_PID" 2>/dev/null; then
+        echo "PostgreSQL failed to start"
+        PG_PID=""
+        return 1
+    fi
 }
+
 migrate_version() {
     echo "PSQL_VERSION: $PSQL_VERSION"
-    overmind kill || true
-    rm -f .overmind.sock Procfile  || true
     PSQLBIN=$(nix build --no-link "$FLAKE_URL#psql_$PSQL_VERSION/bin" --json | jq -r '.[].outputs.out + "/bin"')
     echo "Using PostgreSQL version $PSQL_VERSION from $PSQLBIN"
 
-    # Start overmind
-    overmind_start
-    echo "Waiting for overmind socket..."
-
+    # Start PostgreSQL
+    if ! start_postgres; then
+        echo "Failed to start PostgreSQL server"
+        exit 1
+    fi
 
     echo "Waiting for PostgreSQL to be ready..."
 
-    #Wait for PostgreSQL to be ready to accept connections
+    # Wait for PostgreSQL to be ready to accept connections
     if ! wait_for_postgres; then
         echo "Failed to connect to PostgreSQL server"
+        cleanup
         exit 1
     fi