chenyh
/
vRp.CD2g_test
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

去除错误中携带的堆栈信息

This commit is contained in:
kercylan98 2023-05-20 15:17:03 +08:00
parent 4e31cf90df
commit aa2974ab3d
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server/server.go
View File

@ -9,7 +9,6 @@ import (
"github.com/kercylan98/minotaur/utils/synchronization" "github.com/kercylan98/minotaur/utils/synchronization"
"github.com/kercylan98/minotaur/utils/timer" "github.com/kercylan98/minotaur/utils/timer"
"github.com/panjf2000/gnet" "github.com/panjf2000/gnet"
"github.com/pkg/errors"
"github.com/xtaci/kcp-go/v5" "github.com/xtaci/kcp-go/v5"
"go.uber.org/zap" "go.uber.org/zap"
"google.golang.org/grpc" "google.golang.org/grpc"
@ -17,7 +16,6 @@ import (
"net/http" "net/http"
"os" "os"
"os/signal" "os/signal"
"runtime/debug"
"strings" "strings"
"sync/atomic" "sync/atomic"
"syscall" "syscall"
@ -140,14 +138,14 @@ func (slf *Server) Run(addr string) error {
go func() { go func() {
slf.OnStartBeforeEvent() slf.OnStartBeforeEvent()
if err := slf.grpcServer.Serve(listener); err != nil { 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: case NetworkTCP, NetworkTCP4, NetworkTCP6, NetworkUdp, NetworkUdp4, NetworkUdp6, NetworkUnix:
go connectionInitHandle(func() { go connectionInitHandle(func() {
slf.OnStartBeforeEvent() slf.OnStartBeforeEvent()
if err := gnet.Serve(slf.gServer, protoAddr); err != nil { 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: case NetworkKcp:
@ -194,11 +192,11 @@ func (slf *Server) Run(addr string) error {
slf.httpServer.Addr = slf.addr slf.httpServer.Addr = slf.addr
if len(slf.certFile)+len(slf.keyFile) > 0 { if len(slf.certFile)+len(slf.keyFile) > 0 {
if err := slf.httpServer.ListenAndServeTLS(slf.certFile, slf.keyFile); err != nil { 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 { } else {
if err := slf.httpServer.ListenAndServe(); err != nil { 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() slf.OnStartBeforeEvent()
if len(slf.certFile)+len(slf.keyFile) > 0 { if len(slf.certFile)+len(slf.keyFile) > 0 {
if err := http.ListenAndServeTLS(slf.addr, slf.certFile, slf.keyFile, nil); err != nil { 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 { } else {
if err := http.ListenAndServe(slf.addr, nil); err != nil { 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)) log.Error("Server", zap.Error(err))
case MessageErrorActionShutdown: case MessageErrorActionShutdown:
slf.Shutdown(err) slf.Shutdown(err)
fmt.Println(err)
default: default:
log.Warn("Server", zap.String("not support message error action", action.String())) log.Warn("Server", zap.String("not support message error action", action.String()))
} }