fix: use serverDescriptionChanged event to distinguish between timeou…

…t vs disconnected re: #8383
Automattic · Nov 28, 2019 · ca527f4 · ca527f4
1 parent 9f0a9a9
commit ca527f4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/lib/connection.js b/lib/connection.js
@@ -677,15 +677,16 @@ Connection.prototype.openUri = function(uri, options, callback) {
           server.s.pool.on('reconnect', () => {
             _handleReconnect();
           });
-          server.s.pool.on('timeout', () => {
-            _this.emit('timeout');
-          });
-          client.on('serverClosed', () => {
-            _this.readyState = STATES.disconnected;
-          });
-          server.s.pool.on('drain', err => {
-            if (err && err.name === 'MongoNetworkError' && err.message.endsWith('timed out')) {
+          client.on('serverDescriptionChanged', ev => {
+            const newDescription = ev.newDescription;
+            if (newDescription.type === 'Standalone') {
+              _handleReconnect();
+            } else if (newDescription.error != null &&
+              newDescription.error.name === 'MongoNetworkError' &&
+              newDescription.error.message.endsWith('timed out')) {
               _this.emit('timeout');
+            } else {
+              _this.readyState = STATES.disconnected;
             }
           });
         } else if (type.startsWith('ReplicaSet')) {

diff --git a/test/connection.test.js b/test/connection.test.js
@@ -341,7 +341,6 @@ describe('connections:', function() {
         });
 
         conn.on('disconnected', function() {
-          console.log('Disconnected', new Error().stack);
           ++numDisconnected;
         });