ensuring connection timeout doesn't interfere

mariadb-corporation · Jun 20, 2018 · a8443cc · a8443cc
1 parent 9592b6b
commit a8443cc
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/connection.js b/lib/connection.js
@@ -240,7 +240,8 @@ function Connection(options) {
   this.end = () => {
     _addCommand = _addCommandDisabled;
     if (this.timeout) clearTimeout(this.timeout);
-    if (_status === Status.CONNECTING || _status === Status.CONNECTED) {
+
+    if (_status !== Status.CLOSING && _status !== Status.CLOSING && _status !== Status.NOT_CONNECTED) {
       _status = Status.CLOSING;
       return new Promise(function(resolve, reject) {
         const quitCmd = new Quit(
@@ -654,6 +655,7 @@ function Connection(options) {
    * @private
    */
   const _connectTimeoutReached = function(authFailHandler) {
+    this.timeout = null;
     const handshake = _receiveQueue.peek();
     authFailHandler(
       Errors.createError(