From aa2974ab3dba5b25d2a9d6f823eb47938e1468f1 Mon Sep 17 00:00:00 2001 From: kercylan98 Date: Sat, 20 May 2023 15:17:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=94=99=E8=AF=AF=E4=B8=AD?= =?UTF-8?q?=E6=90=BA=E5=B8=A6=E7=9A=84=E5=A0=86=E6=A0=88=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/server.go | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/server/server.go b/server/server.go index 3c771d2..da9096b 100644 --- a/server/server.go +++ b/server/server.go @@ -9,7 +9,6 @@ import ( "github.com/kercylan98/minotaur/utils/synchronization" "github.com/kercylan98/minotaur/utils/timer" "github.com/panjf2000/gnet" - "github.com/pkg/errors" "github.com/xtaci/kcp-go/v5" "go.uber.org/zap" "google.golang.org/grpc" @@ -17,7 +16,6 @@ import ( "net/http" "os" "os/signal" - "runtime/debug" "strings" "sync/atomic" "syscall" @@ -140,14 +138,14 @@ func (slf *Server) Run(addr string) error { go func() { slf.OnStartBeforeEvent() if err := slf.grpcServer.Serve(listener); err != nil { - slf.PushMessage(MessageTypeError, errors.WithMessage(err, string(debug.Stack())), MessageErrorActionShutdown) + slf.PushMessage(MessageTypeError, err, MessageErrorActionShutdown) } }() case NetworkTCP, NetworkTCP4, NetworkTCP6, NetworkUdp, NetworkUdp4, NetworkUdp6, NetworkUnix: go connectionInitHandle(func() { slf.OnStartBeforeEvent() if err := gnet.Serve(slf.gServer, protoAddr); err != nil { - slf.PushMessage(MessageTypeError, errors.WithMessage(err, string(debug.Stack())), MessageErrorActionShutdown) + slf.PushMessage(MessageTypeError, err, MessageErrorActionShutdown) } }) case NetworkKcp: @@ -194,11 +192,11 @@ func (slf *Server) Run(addr string) error { slf.httpServer.Addr = slf.addr if len(slf.certFile)+len(slf.keyFile) > 0 { if err := slf.httpServer.ListenAndServeTLS(slf.certFile, slf.keyFile); err != nil { - slf.PushMessage(MessageTypeError, errors.WithMessage(err, string(debug.Stack())), MessageErrorActionShutdown) + slf.PushMessage(MessageTypeError, err, MessageErrorActionShutdown) } } else { if err := slf.httpServer.ListenAndServe(); err != nil { - slf.PushMessage(MessageTypeError, errors.WithMessage(err, string(debug.Stack())), MessageErrorActionShutdown) + slf.PushMessage(MessageTypeError, err, MessageErrorActionShutdown) } } @@ -267,11 +265,11 @@ func (slf *Server) Run(addr string) error { slf.OnStartBeforeEvent() if len(slf.certFile)+len(slf.keyFile) > 0 { if err := http.ListenAndServeTLS(slf.addr, slf.certFile, slf.keyFile, nil); err != nil { - slf.PushMessage(MessageTypeError, errors.WithMessage(err, string(debug.Stack())), MessageErrorActionShutdown) + slf.PushMessage(MessageTypeError, err, MessageErrorActionShutdown) } } else { if err := http.ListenAndServe(slf.addr, nil); err != nil { - slf.PushMessage(MessageTypeError, errors.WithMessage(err, string(debug.Stack())), MessageErrorActionShutdown) + slf.PushMessage(MessageTypeError, err, MessageErrorActionShutdown) } } @@ -439,7 +437,6 @@ func (slf *Server) dispatchMessage(msg *message) { log.Error("Server", zap.Error(err)) case MessageErrorActionShutdown: slf.Shutdown(err) - fmt.Println(err) default: log.Warn("Server", zap.String("not support message error action", action.String())) }