Merge pull request #1592 from bombjackit/patch-acquire

dhensby · web-flow · commit f09c23daa93e · 2024-01-16T13:56:35.000Z
_acquire in case of reject return a promise, if this._acquire.promise is used in acquire, in case of reject an exception is raised that is not "captured" by the catch
diff --git a/lib/base/connection-pool.js b/lib/base/connection-pool.js
@@ -363,7 +363,7 @@ class ConnectionPool extends EventEmitter {
    */
 
   acquire (requester, callback) {
-    const acquirePromise = shared.Promise.resolve(this._acquire().promise).catch(err => {
+    const acquirePromise = shared.Promise.resolve(this._acquire()).catch(err => {
       this.emit('error', err)
       throw err
     })
@@ -382,7 +382,7 @@ class ConnectionPool extends EventEmitter {
       return shared.Promise.reject(new ConnectionError('Connection is closing', 'ENOTOPEN'))
     }
 
-    return this.pool.acquire()
+    return this.pool.acquire().promise
   }
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -363,7 +363,7 @@ class ConnectionPool extends EventEmitter {`
`363`	`363`	`*/`
`364`	`364`
`365`	`365`	`acquire (requester, callback) {`
`366`		`- const acquirePromise = shared.Promise.resolve(this._acquire().promise).catch(err => {`
	`366`	`+ const acquirePromise = shared.Promise.resolve(this._acquire()).catch(err => {`
`367`	`367`	`this.emit('error', err)`
`368`	`368`	`throw err`
`369`	`369`	`})`
`@@ -382,7 +382,7 @@ class ConnectionPool extends EventEmitter {`
`382`	`382`	`return shared.Promise.reject(new ConnectionError('Connection is closing', 'ENOTOPEN'))`
`383`	`383`	`}`
`384`	`384`
`385`		`- return this.pool.acquire()`
	`385`	`+ return this.pool.acquire().promise`
`386`	`386`	`}`
`387`	`387`
`388`	`388`	`/**`