wip

seamapi · Feb 21, 2024 · 40b67bd · 40b67bd
1 parent e2096f4
commit 40b67bd
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/src/worker.ts b/src/worker.ts
@@ -178,7 +178,9 @@ export class Worker {
     const databaseName = getRandomDatabaseName()
 
     // Create database
-    const { postgresClient, container } = await this.startContainerPromise
+    const { postgresClient, container, pgbouncerContainer } = await this
+      .startContainerPromise
+
     await postgresClient.query(`CREATE DATABASE ${databaseName};`)
 
     const msg = message.reply({
@@ -246,16 +248,25 @@ export class Worker {
   }
 
   private async getConnectionDetails(databaseName: string) {
-    const { container, network } = await this.startContainerPromise
+    const { container, network, pgbouncerContainer } = await this
+      .startContainerPromise
     const externalDatabaseUrl = `postgresql://postgres:@${container.getHost()}:${container.getMappedPort(
       5432
     )}/${databaseName}`
 
+    let pgbouncerConnectionString
+    if (pgbouncerContainer) {
+      pgbouncerConnectionString = `postgresql://postgres:@${pgbouncerContainer
+        .getName()
+        .replace("/", "")}:5432/${databaseName}`
+    }
+
     return {
       connectionString: externalDatabaseUrl,
       connectionStringDocker: `postgresql://postgres:@${container
         .getName()
         .replace("/", "")}:5432/${databaseName}`,
+      pgbouncerConnectionString,
       dockerNetworkId: network.getId(),
       host: container.getHost(),
       port: container.getMappedPort(5432),
@@ -300,9 +311,11 @@ export class Worker {
       )
     }
 
+    let startedPgbouncerContainer
     if (this.initialData.pgbouncerOptions?.enabled) {
       const pgbouncerContainer = new GenericContainer("edoburu/pgbouncer")
         .withExposedPorts(6432)
+        .withName(getRandomDatabaseName())
         .withEnvironment({
           PGBOUNCER_LISTEN_PORT: "6432",
           PGBOUNCER_POOL_MODE: "transaction",
@@ -315,10 +328,12 @@ export class Worker {
         })
         .withStartupTimeout(120_000)
         .withNetwork(network)
+      startedPgbouncerContainer = await pgbouncerContainer.start()
     }
 
     return {
       container: startedContainer,
+      pgbouncerContainer: startedPgbouncerContainer,
       network,
       postgresClient: new pg.Pool({
         connectionString: `postgresql://postgres:@${startedContainer.getHost()}:${startedContainer.getMappedPort(