diff options
author | Neil Alexander <neilalexander@users.noreply.github.com> | 2021-05-24 11:17:32 +0100 |
---|---|---|
committer | Neil Alexander <neilalexander@users.noreply.github.com> | 2021-05-24 11:17:32 +0100 |
commit | d2d216402517e613111f6c8abd383c389debe86a (patch) | |
tree | 98aae7603a268e0d7c62abd01bf77495397b1269 /cmd | |
parent | 2948ffd78207e0fd354be9a3a637cfdaa3c5154a (diff) |
Update pinecone demo
Diffstat (limited to 'cmd')
-rw-r--r-- | cmd/dendrite-demo-pinecone/conn/client.go | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/cmd/dendrite-demo-pinecone/conn/client.go b/cmd/dendrite-demo-pinecone/conn/client.go index 66f9ebfa..954564d4 100644 --- a/cmd/dendrite-demo-pinecone/conn/client.go +++ b/cmd/dendrite-demo-pinecone/conn/client.go @@ -5,6 +5,7 @@ import ( "net" "net/http" "strings" + "time" "github.com/gorilla/websocket" "github.com/matrix-org/dendrite/setup" @@ -16,15 +17,24 @@ import ( func ConnectToPeer(pRouter *pineconeRouter.Router, peer string) error { var parent net.Conn + dialer := net.Dialer{ + Timeout: time.Second * 5, + KeepAlive: time.Second * 5, + } if strings.HasPrefix(peer, "ws://") || strings.HasPrefix(peer, "wss://") { - c, _, err := websocket.DefaultDialer.Dial(peer, nil) + wsdialer := websocket.Dialer{ + NetDial: dialer.Dial, + NetDialContext: dialer.DialContext, + HandshakeTimeout: time.Second * 5, + } + c, _, err := wsdialer.Dial(peer, nil) if err != nil { return fmt.Errorf("websocket.DefaultDialer.Dial: %w", err) } parent = WrapWebSocketConn(c) } else { var err error - parent, err = net.Dial("tcp", peer) + parent, err = dialer.Dial("tcp", peer) if err != nil { return fmt.Errorf("net.Dial: %w", err) } |