diff options
| author | Niall Sheridan <nsheridan@gmail.com> | 2016-08-27 01:32:30 +0100 |
|---|---|---|
| committer | Niall Sheridan <nsheridan@gmail.com> | 2016-08-27 01:32:30 +0100 |
| commit | 921818bca208f0c70e85ec670074cb3905cbbc82 (patch) | |
| tree | 4aa67ad2bb2083bd486db3f99680d6d08a2c36b3 /vendor/gopkg.in/mgo.v2/cluster.go | |
| parent | 7f1c9358805302344a89c1fed4eab1342931b061 (diff) | |
Update dependencies
Diffstat (limited to 'vendor/gopkg.in/mgo.v2/cluster.go')
| -rw-r--r-- | vendor/gopkg.in/mgo.v2/cluster.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/vendor/gopkg.in/mgo.v2/cluster.go b/vendor/gopkg.in/mgo.v2/cluster.go index e28af5b..c3bf8b0 100644 --- a/vendor/gopkg.in/mgo.v2/cluster.go +++ b/vendor/gopkg.in/mgo.v2/cluster.go @@ -588,7 +588,10 @@ func (cluster *mongoCluster) AcquireSocket(mode Mode, slaveOk bool, syncTimeout mastersLen := cluster.masters.Len() slavesLen := cluster.servers.Len() - mastersLen debugf("Cluster has %d known masters and %d known slaves.", mastersLen, slavesLen) - if !(slaveOk && mode == Secondary) && mastersLen > 0 || slaveOk && slavesLen > 0 { + if mastersLen > 0 && !(slaveOk && mode == Secondary) || slavesLen > 0 && slaveOk { + break + } + if mastersLen > 0 && mode == Secondary && cluster.masters.HasMongos() { break } if started.IsZero() { |