Proper stopping of strategy on replicaset stop

mongodb · Sep 8, 2012 · 01a4ded · 01a4ded
1 parent 1bdfc16
commit 01a4ded
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/lib/mongodb/connection/repl_set.js b/lib/mongodb/connection/repl_set.js
@@ -947,6 +947,9 @@ ReplSet.prototype.close = function(callback) {
     }
   }
 
+  // If we have a strategy stop it
+  if(this.strategyInstance) this.strategyInstance.stop();
+
   // If it's a callback
   if(typeof callback == 'function') callback(null, null);
 }

diff --git a/lib/mongodb/connection/strategies/ping_strategy.js b/lib/mongodb/connection/strategies/ping_strategy.js
@@ -125,7 +125,6 @@ PingStrategy.prototype._pingServer = function(callback) {
   // Ping server function
   var pingFunction = function() {
     if(self.state == 'disconnected') return;
-
     var addresses = self.replicaset._state.addresses;
 
     // Grab all servers
@@ -150,8 +149,8 @@ PingStrategy.prototype._pingServer = function(callback) {
         db.on("error", done);
 
         // Open the db instance
-        db.open(function(err) {
-          if (err) return done();
+        db.open(function(err, _db) {
+          if(err) return done(_db);
 
           // Startup time of the command
           var startTime = Date.now();
@@ -161,13 +160,14 @@ PingStrategy.prototype._pingServer = function(callback) {
             if(null != serverInstance.runtimeStats && serverInstance.isConnected()) {
               serverInstance.runtimeStats['pingMs'] = Date.now() - startTime;
             }
-            done();
+
+            done(_db);
           })
         })
 
-        function done () {
+        function done (_db) {
           // Close connection
-          db.close();
+          _db.close(true);
 
           // Adjust the number of checks
           numberOfEntries--;