RUBY-386 restoring timeout issue on ismaster check

mongodb · Dec 15, 2012 · 405a868 · 405a868
1 parent 3da72c5
commit 405a868
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -14,9 +14,9 @@ group :deploy do
 end
 
 group :testing do
+  gem 'test-unit'
   gem 'mocha', ">=0.13.0", :require => 'mocha/setup'
   gem 'shoulda', ">=3.3.2"
-  gem 'test-unit'
 
   gem 'growl'
   gem 'guard-rspec'

diff --git a/lib/mongo/mongo_client.rb b/lib/mongo/mongo_client.rb
@@ -639,8 +639,14 @@ def check_is_master(node)
         socket = nil
         config = nil
 
-        socket = @socket_class.new(host, port, @op_timeout, @connect_timeout) 
-        config = self['admin'].command({:ismaster => 1}, :socket => socket)
+        socket = @socket_class.new(host, port, @op_timeout, @connect_timeout)
+        if(@connect_timeout)
+          Timeout::timeout(@connect_timeout, OperationTimeout) do
+            config = self['admin'].command({:ismaster => 1}, :socket => socket)
+          end
+        else
+          config = self['admin'].command({:ismaster => 1}, :socket => socket)
+        end
       rescue OperationFailure, SocketError, SystemCallError, IOError
         close
       ensure