From 01d78a1e5c828e6c104907d4d8812ddb00f4c02b Mon Sep 17 00:00:00 2001 From: Wichert Akkerman Date: Sat, 12 Oct 2019 17:46:53 +0200 Subject: [PATCH] Fix error result from Transport.Connect errors --- websocket_transport.go | 9 +++++---- xmpp_transport.go | 5 ++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/websocket_transport.go b/websocket_transport.go index e8031b2..5564a5e 100644 --- a/websocket_transport.go +++ b/websocket_transport.go @@ -23,11 +23,12 @@ func (t *WebsocketTransport) Connect() error { defer cancel() wsConn, _, err := websocket.Dial(ctx, t.Config.Address, nil) - if err == nil { - t.wsConn = wsConn - t.netConn = websocket.NetConn(t.ctx, t.wsConn, websocket.MessageText) + if err != nil { + return NewConnError(err, true) } - return err + t.wsConn = wsConn + t.netConn = websocket.NetConn(t.ctx, t.wsConn, websocket.MessageText) + return nil } func (t WebsocketTransport) StartTLS(domain string) error { diff --git a/xmpp_transport.go b/xmpp_transport.go index 088e22b..9b483cb 100644 --- a/xmpp_transport.go +++ b/xmpp_transport.go @@ -19,7 +19,10 @@ func (t *XMPPTransport) Connect() error { var err error 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 {