From 196a84ebd0cb53a49e040231ee0508d4a250a931 Mon Sep 17 00:00:00 2001
From: Kyle Banker <kylebanker@gmail.com>
Date: Wed, 15 Dec 2010 15:07:01 -0500
Subject: [PATCH] Fix for repl set manager

---
 test/tools/repl_set_manager.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/tools/repl_set_manager.rb b/test/tools/repl_set_manager.rb
index 135ea15..6054083 100644
--- a/test/tools/repl_set_manager.rb
+++ b/test/tools/repl_set_manager.rb
@@ -147,7 +147,7 @@ class ReplSetManager
   def ensure_up
     print "** Ensuring members are up..."
 
-    attempt(Mongo::OperationFailure) do
+    attempt do
       con = get_connection
       status = con['admin'].command({'replSetGetStatus' => 1})
       print "."
@@ -179,7 +179,7 @@ class ReplSetManager
   def initiate
     con = get_connection
 
-    attempt(Mongo::OperationFailure) do
+    attempt do
       con['admin'].command({'replSetInitiate' => @config})
     end
   end
@@ -208,7 +208,7 @@ class ReplSetManager
   end
 
   def get_connection(node=nil)
-    con = attempt(Mongo::ConnectionFailure) do
+    con = attempt do
       if !node
         node = @mongods.keys.detect {|key| !@mongods[key]['arbiterOnly'] && @mongods[key]['up'] }
       end
@@ -222,14 +222,14 @@ class ReplSetManager
     File.join(@path, name)
   end
 
-  def attempt(exception)
+  def attempt
     raise "No block given!" unless block_given?
     count = 0
 
     while count < @retries do
       begin
         return yield
-        rescue exception, Mongo::ConnectionFailure
+        rescue Mongo::OperationFailure, Mongo::ConnectionFailure
           sleep(1)
           count += 1
       end