From 303ff413efedd3c5ae366c3d30e1572401dce266 Mon Sep 17 00:00:00 2001
From: hmzzrcs <hmzzrcs@163.com>
Date: Mon, 20 May 2024 16:43:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Ddubbo=E5=8D=8F=E8=AE=AE?=
 =?UTF-8?q?=E7=9A=84=E6=8A=A5=E9=94=99=E4=BF=A1=E6=81=AF,=E4=B8=8D?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=A0=86=E6=A0=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dubbo-getty/server.go | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/dubbo-getty/server.go b/dubbo-getty/server.go
index ee3c94ec..5e371b2c 100644
--- a/dubbo-getty/server.go
+++ b/dubbo-getty/server.go
@@ -21,6 +21,7 @@ import (
 	"context"
 	"crypto/tls"
 	"crypto/x509"
+	"errors"
 	"fmt"
 	"github.com/eolinker/eosc/log"
 	"net"
@@ -270,7 +271,7 @@ func (s *server) accept(newSession NewSessionCallback) (Session, error) {
 		return nil, perrors.WithStack(err)
 	}
 	if gxnet.IsSameAddr(conn.RemoteAddr(), conn.LocalAddr()) {
-		log.Warnf("conn.localAddr{%s} == conn.RemoteAddr", conn.LocalAddr().String(), conn.RemoteAddr().String())
+		log.Warnf("conn.localAddr{%s} == conn.RemoteAddr{%s}", conn.LocalAddr().String(), conn.RemoteAddr().String())
 		return nil, perrors.WithStack(errSelfConnect)
 	}
 
@@ -303,7 +304,8 @@ func (s *server) runTCPEventLoop(newSession NewSessionCallback) {
 			}
 			client, err = s.accept(newSession)
 			if err != nil {
-				if netErr, ok := perrors.Cause(err).(net.Error); ok && netErr.Timeout() {
+				var netErr net.Error
+				if errors.As(perrors.Cause(err), &netErr) && netErr.Timeout() {
 					if delay == 0 {
 						delay = 5 * time.Millisecond
 					} else {
@@ -314,8 +316,8 @@ func (s *server) runTCPEventLoop(newSession NewSessionCallback) {
 					}
 					continue
 				}
-				log.Warnf("server{%s}.Accept() = err {%+v}", s.addr, perrors.WithStack(err))
-				continue
+				log.Warnf("server{%s}.Accept() = err {%+v}", s.addr, perrors.Cause(err))
+				break
 			}
 			delay = 0
 			client.(*session).run()