Fix unhandled errors (#1271)

im-kulikov · vishr · commit bc28fceaf38c · 2019-02-01T06:33:56.000-08:00
diff --git a/echo.go b/echo.go
@@ -764,13 +764,14 @@ type tcpKeepAliveListener struct {
 }
 
 func (ln tcpKeepAliveListener) Accept() (c net.Conn, err error) {
-	tc, err := ln.AcceptTCP()
-	if err != nil {
+	if c, err = ln.AcceptTCP(); err != nil {
+		return
+	} else if err = c.(*net.TCPConn).SetKeepAlive(true); err != nil {
+		return
+	} else if err = c.(*net.TCPConn).SetKeepAlivePeriod(3 * time.Minute); err != nil {
 		return
 	}
-	tc.SetKeepAlive(true)
-	tc.SetKeepAlivePeriod(3 * time.Minute)
-	return tc, nil
+	return
 }
 
 func newListener(address string) (*tcpKeepAliveListener, error) {

Original file line number	Diff line number	Diff line change
`@@ -764,13 +764,14 @@ type tcpKeepAliveListener struct {`
`764`	`764`	`}`
`765`	`765`
`766`	`766`	`func (ln tcpKeepAliveListener) Accept() (c net.Conn, err error) {`
`767`		`- tc, err := ln.AcceptTCP()`
`768`		`- if err != nil {`
	`767`	`+ if c, err = ln.AcceptTCP(); err != nil {`
	`768`	`+ return`
	`769`	`+ } else if err = c.(*net.TCPConn).SetKeepAlive(true); err != nil {`
	`770`	`+ return`
	`771`	`+ } else if err = c.(net.TCPConn).SetKeepAlivePeriod(3 time.Minute); err != nil {`
`769`	`772`	`return`
`770`	`773`	`}`
`771`		`- tc.SetKeepAlive(true)`
`772`		`- tc.SetKeepAlivePeriod(3 * time.Minute)`
`773`		`- return tc, nil`
	`774`	`+ return`
`774`	`775`	`}`
`775`	`776`
`776`	`777`	`func newListener(address string) (*tcpKeepAliveListener, error) {`