fix: prevent reuse of broken connections in postgres pool

typeorm · Jun 23, 2021 · fb01d9d · fb01d9d
1 parent 9300710
commit fb01d9d
Showing 1 changed file with 22 additions and 11 deletions.
diff --git a/src/driver/postgres/PostgresQueryRunner.ts b/src/driver/postgres/PostgresQueryRunner.ts
@@ -50,7 +50,7 @@ export class PostgresQueryRunner extends BaseQueryRunner implements QueryRunner
     /**
      * Special callback provided by a driver used to release a created connection.
      */
-    protected releaseCallback: Function;
+    protected releaseCallback?: (err: any) => void;
 
     // -------------------------------------------------------------------------
     // Constructor
@@ -84,7 +84,7 @@ export class PostgresQueryRunner extends BaseQueryRunner implements QueryRunner
                 this.driver.connectedQueryRunners.push(this);
                 this.databaseConnection = connection;
 
-                const onErrorCallback = () => this.release();
+                const onErrorCallback = (err: Error) => this.releasePostgresConnection(err);
                 this.releaseCallback = () => {
                     this.databaseConnection.removeListener("error", onErrorCallback);
                     release();
@@ -99,7 +99,7 @@ export class PostgresQueryRunner extends BaseQueryRunner implements QueryRunner
                 this.driver.connectedQueryRunners.push(this);
                 this.databaseConnection = connection;
 
-                const onErrorCallback = () => this.release();
+                const onErrorCallback = (err: Error) => this.releasePostgresConnection(err);
                 this.releaseCallback = () => {
                     this.databaseConnection.removeListener("error", onErrorCallback);
                     release();
@@ -114,22 +114,33 @@ export class PostgresQueryRunner extends BaseQueryRunner implements QueryRunner
     }
 
     /**
-     * Releases used database connection.
-     * You cannot use query runner methods once its released.
+     * Release a connection back to the pool, optionally specifying an Error to release with.
+     * Per pg-pool documentation this will prevent the pool from re-using the broken connection.
      */
-    release(): Promise<void> {
+    private async releasePostgresConnection(err?: Error) {
         if (this.isReleased) {
-            return Promise.resolve();
+            return
         }
 
         this.isReleased = true;
-        if (this.releaseCallback)
-            this.releaseCallback();
+        if (this.releaseCallback) {
+            this.releaseCallback(err);
+            this.releaseCallback = undefined
+        }
 
         const index = this.driver.connectedQueryRunners.indexOf(this);
-        if (index !== -1) this.driver.connectedQueryRunners.splice(index, 1);
 
-        return Promise.resolve();
+        if (index !== -1) {
+            this.driver.connectedQueryRunners.splice(index, 1);
+        }
+    }
+
+    /**
+     * Releases used database connection.
+     * You cannot use query runner methods once its released.
+     */
+    release(): Promise<void> {
+        return this.releasePostgresConnection();
     }
 
     /**