cyonjan/frp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

proxy.go: Minor cleanup due to PR feedbacks

Browse Source
This commit is contained in:
Fishbone 2021-07-04 18:49:13 +08:00
parent a41824b454
commit f01f36edd1
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/proxy/proxy.go
View File

@ -159,9 +159,6 @@ func (pxy *BaseProxy) startListenHandler(p Proxy, handler func(Proxy, net.Conn,
// if listener is closed, err returned // if listener is closed, err returned
c, err := l.Accept() c, err := l.Accept()
if err != nil { if err != nil {
xl.Warn("listener is closed: %s", err)
// see: net/mux/mux.go#Serve()
if err, ok := err.(interface{ Temporary() bool }); ok && err.Temporary() { if err, ok := err.(interface{ Temporary() bool }); ok && err.Temporary() {
if tempDelay == 0 { if tempDelay == 0 {
tempDelay = 5 * time.Millisecond tempDelay = 5 * time.Millisecond
@ -171,11 +168,12 @@ func (pxy *BaseProxy) startListenHandler(p Proxy, handler func(Proxy, net.Conn,
if max := 1 * time.Second; tempDelay > max { if max := 1 * time.Second; tempDelay > max {
tempDelay = max tempDelay = max
} }
xl.Info("met temporary error when accepting, sleep for %s ...", tempDelay) xl.Info("met temporary error: %s, sleep for %s ...", err, tempDelay)
time.Sleep(tempDelay) time.Sleep(tempDelay)
continue continue
} }
xl.Warn("listener is closed: %s", err)
return return
} }
xl.Info("get a user connection [%s]", c.RemoteAddr().String()) xl.Info("get a user connection [%s]", c.RemoteAddr().String())