Merge e12ccee into 2d92a6b

mongoid · Sep 4, 2014 · 4236bca · 4236bca
2 parents 2d92a6b + e12ccee
commit 4236bca
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/lib/moped/authenticatable.rb b/lib/moped/authenticatable.rb
@@ -71,7 +71,14 @@ def login(database, username, password)
       self.write([ authenticate ])
       document = self.read.documents.first
 
-      raise Errors::AuthenticationFailure.new(authenticate, document) unless document["ok"] == 1
+      unless document["ok"] == 1
+        # It may be the case that there are socket errors when trying to connect to the host
+        reconfig = Errors::PotentialReconfiguration.new(authenticate, document)
+        if reconfig.reconfiguring_replica_set? || reconfig.connection_failure?
+          raise reconfig
+        end
+        raise Errors::AuthenticationFailure.new(authenticate, document)
+      end
       credentials[database] = [username, password]
     end
 

diff --git a/lib/moped/errors.rb b/lib/moped/errors.rb
@@ -115,7 +115,7 @@ class PotentialReconfiguration < MongoError
       NOT_MASTER = [ 13435, 13436, 10009 ]
 
       # Error codes received around reconfiguration
-      CONNECTION_ERRORS_RECONFIGURATION = [ 15988, 10276, 11600, 9001, 13639, 10009 ]
+      CONNECTION_ERRORS_RECONFIGURATION = [ 15988, 10276, 11600, 9001, 13639, 10009, 11002 ]
 
       # Replica set reconfigurations can be either in the form of an operation
       # error with code 13435, or with an error message stating the server is