narayana/go-xmpp
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix websocket connect timeout

Browse source
This commit is contained in:
Wichert Akkerman 2019-10-12 17:50:00 +02:00 committed by Mickaël Rémond
parent 01d78a1e5c
commit 87ff01ac68
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
websocket_transport.go
View file

@ -19,10 +19,13 @@ type WebsocketTransport struct {
func (t *WebsocketTransport) Connect() error { func (t *WebsocketTransport) Connect() error {
t.ctx = context.Background() t.ctx = context.Background()
ctx, cancel := context.WithTimeout(t.ctx, time.Duration(t.Config.ConnectTimeout)*time.Second) if t.Config.ConnectTimeout > 0 {
defer cancel() ctx, cancel := context.WithTimeout(t.ctx, time.Duration(t.Config.ConnectTimeout)*time.Second)
t.ctx = ctx
defer cancel()
}
wsConn, _, err := websocket.Dial(ctx, t.Config.Address, nil) wsConn, _, err := websocket.Dial(t.ctx, t.Config.Address, nil)
if err != nil { if err != nil {
return NewConnError(err, true) return NewConnError(err, true)
} }