[CONJS-288] ensure pool timeout error give details #268

mariadb-corporation · Apr 24, 2024 · 75d97f9 · 75d97f9
1 parent 2cbeb34
commit 75d97f9
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/lib/pool.js b/lib/pool.js
@@ -39,7 +39,7 @@ class Pool extends EventEmitter {
   //*****************************************************************
 
   _doCreateConnection(resolve, reject, timeoutEnd) {
-    this._createConnection()
+    this._createConnection(timeoutEnd)
       .then((conn) => {
         if (this.#closed) {
           conn.forceEnd(
@@ -395,8 +395,14 @@ class Pool extends EventEmitter {
     return info;
   }
 
-  async _createConnection() {
-    const conn = new Connection(this.opts.connOptions);
+  async _createConnection(timeoutEnd) {
+    // ensure setting a connection timeout if no connection timeout is set
+    const minTimeout = Math.max(1, timeoutEnd - 100);
+    const connectionOpts =
+      !this.opts.connOptions.connectTimeout || this.opts.connOptions.connectTimeout > minTimeout
+        ? Object.assign({}, this.opts.connOptions, { connectTimeout: minTimeout })
+        : this.opts.connOptions;
+    const conn = new Connection(connectionOpts);
     await conn.connect();
     const pool = this;
     conn.forceEnd = conn.end;