Skip to content

Commit 2538383

Browse files
authored
Merge pull request go-mgo#3 from ContextLogic/hardcode
Hardcode initialConnect timeout
2 parents e7c28b6 + 6e8bf4a commit 2538383

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

server.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ func (server *mongoServer) Connect(timeout time.Duration) (*mongoSocket, error)
166166
case !dial.isSet():
167167
// Cannot do this because it lacks timeout support. :-(
168168
//conn, err = net.DialTCP("tcp", nil, server.tcpaddr)
169-
conn, err = net.DialTimeout("tcp", server.ResolvedAddr, timeout)
169+
conn, err = net.DialTimeout("tcp", server.ResolvedAddr, time.Second*2)
170170
if tcpconn, ok := conn.(*net.TCPConn); ok {
171171
tcpconn.SetKeepAlive(true)
172172
} else if err == nil {

0 commit comments

Comments
 (0)