Merge pull request globalsign#1 from dvic/fix_dial_deadlock

Make run on socket helper methods private

cluster.go

@@ -181,7 +181,7 @@ func (cluster *mongoCluster) isMaster(socket *mongoSocket, result *isMasterResul
  })
  })
 
- err := session.RunOnSocket(socket, cmd, result)
+ err := session.runOnSocket(socket, cmd, result)
  session.Close()
  return err
 }

session.go

@@ -848,10 +848,10 @@ func (db *Database) Run(cmd interface{}, result interface{}) error {
  return db.run(socket, cmd, result)
 }
 
-// RunOnSocket does the same as Run, but guarantees that your command will be run
+// runOnSocket does the same as Run, but guarantees that your command will be run
 // on the provided socket instance; if it's unhealthy, you will receive the error
 // from it.
-func (db *Database) RunOnSocket(socket *mongoSocket, cmd interface{}, result interface{}) error {
+func (db *Database) runOnSocket(socket *mongoSocket, cmd interface{}, result interface{}) error {
  socket.Acquire()
  defer socket.Release()
  return db.run(socket, cmd, result)
@@ -2321,11 +2321,11 @@ func (s *Session) Run(cmd interface{}, result interface{}) error {
  return s.DB("admin").Run(cmd, result)
 }
 
-// RunOnSocket does the same as Run, but guarantees that your command will be run
+// runOnSocket does the same as Run, but guarantees that your command will be run
 // on the provided socket instance; if it's unhealthy, you will receive the error
 // from it.
-func (s *Session) RunOnSocket(socket *mongoSocket, cmd interface{}, result interface{}) error {
- return s.DB("admin").RunOnSocket(socket, cmd, result)
+func (s *Session) runOnSocket(socket *mongoSocket, cmd interface{}, result interface{}) error {
+ return s.DB("admin").runOnSocket(socket, cmd, result)
 }
 
 // SelectServers restricts communication to servers configured with the