diff --git a/transport/internet/websocket/wsconn.go b/transport/internet/websocket/connection.go similarity index 100% rename from transport/internet/websocket/wsconn.go rename to transport/internet/websocket/connection.go diff --git a/transport/internet/websocket/dialer.go b/transport/internet/websocket/dialer.go index 36b6f06b..e66f5e5d 100644 --- a/transport/internet/websocket/dialer.go +++ b/transport/internet/websocket/dialer.go @@ -30,10 +30,9 @@ func Dial(ctx context.Context, dest v2net.Destination) (internet.Connection, err } if conn == nil { var err error - conn, err = wsDial(ctx, dest) + conn, err = dialWebsocket(ctx, dest) if err != nil { - log.Warning("WebSocket|Dialer: Dial failed: ", err) - return nil, err + return nil, errors.Base(err).Message("WebSocket|Dialer: Dial failed.") } } return internal.NewConnection(id, conn, globalCache, internal.ReuseConnection(wsSettings.IsConnectionReuse())), nil @@ -43,7 +42,7 @@ func init() { common.Must(internet.RegisterTransportDialer(internet.TransportProtocol_WebSocket, Dial)) } -func wsDial(ctx context.Context, dest v2net.Destination) (net.Conn, error) { +func dialWebsocket(ctx context.Context, dest v2net.Destination) (net.Conn, error) { src := internet.DialerSourceFromContext(ctx) wsSettings := internet.TransportSettingsFromContext(ctx).(*Config)