File tree Expand file tree Collapse file tree 4 files changed +11
-13
lines changed Expand file tree Collapse file tree 4 files changed +11
-13
lines changed Original file line number Diff line number Diff line change @@ -19,7 +19,7 @@ type Conn struct {
19
19
netConn net.Conn
20
20
21
21
// for checking the health status of the connection, it may be nil.
22
- rawConn syscall.RawConn
22
+ sysConn syscall.Conn
23
23
24
24
rd * proto.Reader
25
25
bw * bufio.Writer
@@ -60,7 +60,7 @@ func (cn *Conn) SetNetConn(netConn net.Conn) {
60
60
}
61
61
62
62
func (cn * Conn ) setRawConn () {
63
- cn .rawConn = nil
63
+ cn .sysConn = nil
64
64
conn := cn .netConn
65
65
if conn == nil {
66
66
return
@@ -70,9 +70,7 @@ func (cn *Conn) setRawConn() {
70
70
}
71
71
72
72
if sysConn , ok := conn .(syscall.Conn ); ok {
73
- if rawConn , err := sysConn .SyscallConn (); err == nil {
74
- cn .rawConn = rawConn
75
- }
73
+ cn .sysConn = sysConn
76
74
}
77
75
}
78
76
Original file line number Diff line number Diff line change @@ -10,7 +10,7 @@ import (
10
10
11
11
var errUnexpectedRead = errors .New ("unexpected read from socket" )
12
12
13
- func connCheck (rawConn syscall.RawConn ) error {
13
+ func connCheck (sysConn syscall.Conn ) error {
14
14
//// Reset previous timeout.
15
15
//_ = conn.SetDeadline(time.Time{})
16
16
//
@@ -22,10 +22,10 @@ func connCheck(rawConn syscall.RawConn) error {
22
22
//if !ok {
23
23
// return nil
24
24
//}
25
- // rawConn, err := sysConn.SyscallConn()
26
- // if err != nil {
27
- // return err
28
- // }
25
+ rawConn , err := sysConn .SyscallConn ()
26
+ if err != nil {
27
+ return err
28
+ }
29
29
30
30
var sysErr error
31
31
Original file line number Diff line number Diff line change 6
6
"syscall"
7
7
)
8
8
9
- func connCheck (_ syscall.RawConn ) error {
9
+ func connCheck (_ syscall.Conn ) error {
10
10
return nil
11
11
}
Original file line number Diff line number Diff line change @@ -511,10 +511,10 @@ func (p *ConnPool) isHealthyConn(cn *Conn) bool {
511
511
return false
512
512
}
513
513
514
- if cn .rawConn != nil {
514
+ if cn .sysConn != nil {
515
515
// reset previous timeout.
516
516
_ = cn .netConn .SetDeadline (zeroTime )
517
- if connCheck (cn .rawConn ) != nil {
517
+ if connCheck (cn .sysConn ) != nil {
518
518
return false
519
519
}
520
520
}
You can’t perform that action at this time.
0 commit comments