Fix Postgres pool retry (#8)

MicahParks · Jan 13, 2024 · 4be27c4 · 4be27c4
1 parent 8f906af
commit 4be27c4
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 24 deletions.
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
diff --git a/docker-compose.quickstart.yml b/docker-compose.quickstart.yml
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,6  1,16 @@
-version: "3"
-# This file is meant for local development with the Postgres service. See the docker-compose.override.yml file.
 version: "3.8"
 services:
   magiclinksdev:
     image: "micahparks/magiclinksdevnop"
     ports:
       - "8080:8080"
     volumes:
       - "./config.quickstart.json:/config.json"
   mldpostgres:
     image: "postgres:15"
     environment:
       POSTGRES_PASSWORD: "password"
     ports:
       - "5432:5432"
     volumes:
       - "./storage/postgres/startup.sql:/docker-entrypoint-initdb.d/startup.sql"
diff --git a/storage/postgres/setup.go b/storage/postgres/setup.go
@@ -135,10  135,13 @@ func pool(ctx context.Context, config Config) (*pgxpool.Pool, error) {
 	c.MaxConnIdleTime = config.MaxIdle.Get()
 	c.MinConns = config.MinConns
 
-	var conn *pgxpool.Pool
 	conn, err := pgxpool.NewWithConfig(ctx, c)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create database connection pool: %w", err)
 	}
 	const retries = 5
 	for i := 0; i < retries; i   {
-		conn, err = pgxpool.NewWithConfig(ctx, c)
 		err = conn.Ping(ctx)
 		if err != nil {
 			select {
 			case <-ctx.Done():