performance / fix remove listeners on query and connection (#388)

* fix remove listeners on query and connection * Update src/database/connection.ts Co-authored-by: Kamil Ogórek <[email protected]> --------- Co-authored-by: Kamil Ogórek <[email protected]>
supabase · Oct 23, 2023 · 7daee60 · 7daee60
1 parent ffc4926
commit 7daee60
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/database/connection.ts b/src/database/connection.ts
@@ -127,7 +127,8 @@ export class TenantConnection {
 
   async dispose() {
     if (this.options.isExternalPool) {
-      return this.pool.destroy()
+      await this.pool.destroy()
+      this.pool.client.removeAllListeners()
     }
   }
 

diff --git a/src/storage/database/knex.ts b/src/storage/database/knex.ts
@@ -49,7 +49,7 @@ export class StorageKnexDB implements Database {
         try {
           await this.connection.setScope(tnx)
 
-          tnx.on('query-error', (error) => {
+          tnx.once('query-error', (error) => {
             throw DBError.fromDBError(error)
           })
 
@@ -62,6 +62,8 @@ export class StorageKnexDB implements Database {
         } catch (e) {
           await tnx.rollback()
           throw e
+        } finally {
+          tnx.removeAllListeners()
         }
       } catch (e) {
         error = e
@@ -463,8 +465,7 @@ export class StorageKnexDB implements Database {
 
   protected async runQuery<T extends (db: Knex.Transaction) => Promise<any>>(
     queryName: string,
-    fn: T,
-    isolation?: Knex.IsolationLevels
+    fn: T
   ): Promise<Awaited<ReturnType<T>>> {
     const timer = DbQueryPerformance.startTimer({
       name: queryName,
@@ -481,7 +482,7 @@ export class StorageKnexDB implements Database {
 
     if (!tnx || needsNewTransaction) {
       tnx = await this.connection.transactionProvider(this.options.tnx)()
-      tnx.on('query-error', (error: DatabaseError) => {
+      tnx.once('query-error', (error: DatabaseError) => {
         throw DBError.fromDBError(error)
       })
     }
@@ -512,6 +513,10 @@ export class StorageKnexDB implements Database {
       }
       timer()
       throw e
+    } finally {
+      if (needsNewTransaction) {
+        tnx.removeAllListeners()
+      }
     }
   }
 }