cleanup pool

denodrivers · Apr 28, 2024 · 4b475f4 · 4b475f4
1 parent 2980d63
commit 4b475f4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 17 deletions.
diff --git a/lib/pool.ts b/lib/pool.ts
@@ -19,10 +19,8 @@ import {
   MysqlPoolAcquireEvent,
   MysqlPoolCloseEvent,
   MysqlPoolConnectEvent,
-  MysqlPoolDestroyEvent,
   MysqlPoolReleaseEvent,
 } from "./utils/events.ts";
-import { logger } from "./utils/logger.ts";
 import { MysqlClientEventTarget } from "./utils/events.ts";
 
 export interface MysqlClientPoolOptions
@@ -129,6 +127,9 @@ export class MysqlClientPool extends SqlxBase implements
 
   async acquire(): Promise<MysqlPoolClient> {
     const client = await this.deferredStack.pop();
+    if (!client.connected) {
+      await client.connection.connect();
+    }
 
     this.eventTarget.dispatchEvent(
       new MysqlPoolAcquireEvent({ connectable: client }),
@@ -144,7 +145,6 @@ export class MysqlClientPool extends SqlxBase implements
       this.deferredStack.push(client);
     } catch (e) {
       if (e instanceof SqlxError && e.message === "Max pool size reached") {
-        logger().debug(e.message);
         await client.connection.close();
         throw e;
       } else {
@@ -153,13 +153,6 @@ export class MysqlClientPool extends SqlxBase implements
     }
   }
 
-  async destroy(client: MysqlPoolClient): Promise<void> {
-    this.eventTarget.dispatchEvent(
-      new MysqlPoolDestroyEvent({ connectable: client }),
-    );
-    await client.connection.close();
-  }
-
   async [Symbol.asyncDispose](): Promise<void> {
     await this.close();
   }

diff --git a/lib/utils/events.ts b/lib/utils/events.ts
@@ -5,7 +5,6 @@ import {
   type SqlxConnectableEventInit,
   SqlxEventTarget,
   SqlxPoolConnectableAcquireEvent,
-  SqlxPoolConnectableDestroyEvent,
   SqlxPoolConnectableReleaseEvent,
   type SqlxPoolConnectionEventType,
 } from "@halvardm/sqlx";
@@ -58,10 +57,6 @@ export class MysqlPoolReleaseEvent
   extends SqlxPoolConnectableReleaseEvent<MysqlPoolEventInit> {
 }
 
-export class MysqlPoolDestroyEvent
-  extends SqlxPoolConnectableDestroyEvent<MysqlPoolEventInit> {
-}
-
 export type MysqlClientEvents =
   | MysqlClientConnectEvent
   | MysqlClientCloseEvent;
@@ -70,5 +65,4 @@ export type MysqlPoolEvents =
   | MysqlClientConnectEvent
   | MysqlClientCloseEvent
   | MysqlPoolAcquireEvent
-  | MysqlPoolReleaseEvent
-  | MysqlPoolDestroyEvent;
+  | MysqlPoolReleaseEvent;