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

Fix error result from Transport.Connect errors

Browse source
This commit is contained in:
Wichert Akkerman 2019-10-12 17:46:53 +02:00 committed by Mickaël Rémond
parent 8fb3e33a1f
commit 01d78a1e5c
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
websocket_transport.go
View file

@ -23,11 +23,12 @@ func (t *WebsocketTransport) Connect() error {
defer cancel() defer cancel()
wsConn, _, err := websocket.Dial(ctx, t.Config.Address, nil) wsConn, _, err := websocket.Dial(ctx, t.Config.Address, nil)
if err == nil { if err != nil {
t.wsConn = wsConn return NewConnError(err, true)
t.netConn = websocket.NetConn(t.ctx, t.wsConn, websocket.MessageText)
} }
return err t.wsConn = wsConn
t.netConn = websocket.NetConn(t.ctx, t.wsConn, websocket.MessageText)
return nil
} }
func (t WebsocketTransport) StartTLS(domain string) error { func (t WebsocketTransport) StartTLS(domain string) error {

5
xmpp_transport.go
View file

@ -19,7 +19,10 @@ func (t *XMPPTransport) Connect() error {
var err error var err error
t.conn, err = net.DialTimeout("tcp", t.Config.Address, time.Duration(t.Config.ConnectTimeout)*time.Second) t.conn, err = net.DialTimeout("tcp", t.Config.Address, time.Duration(t.Config.ConnectTimeout)*time.Second)
return err if err != nil {
return NewConnError(err, true)
}
return nil
} }
func (t XMPPTransport) DoesStartTLS() bool { func (t XMPPTransport) DoesStartTLS() bool {