fixup! fix(server): retry initial connection to postgres

coadler · coadler · commit d412076c3099 · 2023-04-28T18:00:08.000Z
diff --git a/cli/server.go b/cli/server.go
@@ -1753,15 +1753,10 @@ func connectToPostgres(ctx context.Context, logger slog.Logger, driver string, d
 			continue
 		}
 
-		pingCtx, pingCancel := context.WithTimeout(ctx, 5*time.Second)
-		err = sqlDB.PingContext(pingCtx)
+		err = pingPostgres(ctx, sqlDB)
 		if err != nil {
-			pingCancel()
 			continue
 		}
-		pingCancel()
-
-		err = nil
 	}
 	if err != nil {
 		return nil, xerrors.Errorf("connect to postgres; tries %d; last error: %w", tries, err)
@@ -1819,6 +1814,12 @@ func connectToPostgres(ctx context.Context, logger slog.Logger, driver string, d
 	return sqlDB, nil
 }
 
+func pingPostgres(ctx context.Context, db *sql.DB) error {
+	ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
+	defer cancel()
+	return db.PingContext(ctx)
+}
+
 type HTTPServers struct {
 	HTTPUrl      *url.URL
 	HTTPListener net.Listener
