lib/mongo/server/monitor.rb in mongo-2.1.0.beta vs lib/mongo/server/monitor.rb in mongo-2.1.0.rc0

@@ -138,11 +138,11 @@
       #
       # @return [ Boolean ] Is the Thread stopped?
       #
       # @since 2.0.0
       def stop!
-        @thread.kill && @thread.stop?
+        connection.disconnect! && @thread.kill && @thread.stop?
       end
 
       # Restarts the server monitor unless the current thread is alive.
       #
       # @example Restart the monitor.
@@ -171,10 +171,10 @@
           start = Time.now
           begin
             result = connection.dispatch([ ISMASTER ]).documents[0]
             return result, calculate_average_round_trip_time(start)
           rescue Exception => e
-            log_debug([ e.message ])
+            log_debug(e.message)
             return {}, calculate_average_round_trip_time(start)
           end
         end
       end