lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-04-11 16:25:39 -04:00
Code Issues Releases Wiki Activity

refine error handling in retry logic

Browse Source
This commit is contained in:
Darien Raymond
2017-02-10 11:41:50 +01:00
parent 51745e772c
commit 5e7fb6d0dd
10 changed files with 33 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
transport/internet/websocket/dialer.go
View File

@@ -2,12 +2,12 @@ package websocket
import (
"context"
"io/ioutil"
"net"
"github.com/gorilla/websocket"
"v2ray.com/core/app/log"
"v2ray.com/core/common"
"v2ray.com/core/common/errors"
v2net "v2ray.com/core/common/net"
"v2ray.com/core/transport/internet"
"v2ray.com/core/transport/internet/internal"
@@ -78,11 +78,11 @@ func wsDial(ctx context.Context, dest v2net.Destination) (net.Conn, error) {
conn, resp, err := dialer.Dial(uri, nil)
if err != nil {
var reason string
if resp != nil {
reason, reasonerr := ioutil.ReadAll(resp.Body)
log.Info(string(reason), reasonerr)
reason = resp.Status
}
return nil, err
return nil, errors.Base(err).Format("WebSocket|Dialer: Failed to dial to (", uri, "): ", reason)
}
return &wsconn{