fix(autoEncryption): tear down mongocryptd client when main client cl…

…oses Fixes NODE-2051
mongodb · Aug 13, 2019 · fe2f57e · fe2f57e
1 parent d3670c2
commit fe2f57e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/lib/operations/close.js b/lib/operations/close.js
@@ -23,13 +23,22 @@ class CloseOperation extends OperationBase {
       client.removeAllListeners('close');
       callback(err, null);
     };
+    const mongocryptdClientClose = err => {
+      const mongocryptdClient = client.s.mongocryptdClient;
+      if (!mongocryptdClient) {
+        completeClose(err);
+        return;
+      }
+
+      mongocryptdClient.close(force, err2 => completeClose(err || err2));
+    };
 
     if (client.topology == null) {
-      completeClose();
+      mongocryptdClientClose();
       return;
     }
 
-    client.topology.close(force, completeClose);
+    client.topology.close(force, mongocryptdClientClose);
   }
 }
 

diff --git a/lib/operations/connect.js b/lib/operations/connect.js
@@ -497,6 +497,7 @@ function createTopology(mongoClient, topologyType, options, callback) {
       useNewUrlParser: true,
       useUnifiedTopology: true
     });
+    mongoClient.s.mongocryptdClient = mongocryptdClient;
     mongocryptdClient.connect(err => {
       if (err) return callback(err, null);