diff --git a/internal/api/route.go b/internal/api/route.go index 0842c0594..c136d1b98 100644 --- a/internal/api/route.go +++ b/internal/api/route.go @@ -16,6 +16,7 @@ package api import ( "context" + "errors" "fmt" "net" "net/http" @@ -52,8 +53,8 @@ import ( func Start(config *config.GlobalConfig, port int, proPort int) error { if port == 0 || proPort == 0 { - err := "port or proPort is empty:" + strconv.Itoa(port) + "," + strconv.Itoa(proPort) - return errs.Wrap(fmt.Errorf(err)) + err := errors.New("port or proPort is empty:" + strconv.Itoa(port) + "," + strconv.Itoa(proPort)) + return errs.Wrap(err) } rdb, err := cache.NewRedis(&config.Redis) if err != nil { @@ -85,7 +86,7 @@ func Start(config *config.GlobalConfig, port int, proPort int) error { p := ginprom.NewPrometheus("app", prommetrics.GetGinCusMetrics("Api")) p.SetListenAddress(fmt.Sprintf(":%d", proPort)) if err = p.Use(router); err != nil && err != http.ErrServerClosed { - netErr = errs.Wrap(err, fmt.Sprintf("prometheus start err: %d", proPort)) + netErr = errs.WrapMsg(err, fmt.Sprintf("prometheus start err: %d", proPort)) netDone <- struct{}{} } }() @@ -104,7 +105,7 @@ func Start(config *config.GlobalConfig, port int, proPort int) error { go func() { err = server.ListenAndServe() if err != nil && err != http.ErrServerClosed { - netErr = errs.Wrap(err, fmt.Sprintf("api start err: %s", server.Addr)) + netErr = errs.WrapMsg(err, fmt.Sprintf("api start err: %s", server.Addr)) netDone <- struct{}{} } diff --git a/internal/msggateway/client.go b/internal/msggateway/client.go index 7017cf7d4..cbddf3d87 100644 --- a/internal/msggateway/client.go +++ b/internal/msggateway/client.go @@ -188,7 +188,7 @@ func (c *Client) handleMessage(message []byte) error { } if binaryReq.SendID != c.UserID { - return errs.Wrap(errors.New("exception conn userID not same to req userID"), binaryReq.String()) + return errs.WrapMsg(errors.New("exception conn userID not same to req userID"), binaryReq.String()) } ctx := mcontext.WithMustInfoCtx( diff --git a/internal/msggateway/n_ws_server.go b/internal/msggateway/n_ws_server.go index b1caa9059..965464fe7 100644 --- a/internal/msggateway/n_ws_server.go +++ b/internal/msggateway/n_ws_server.go @@ -209,7 +209,7 @@ func (ws *WsServer) Run(done chan error) error { case err = <-done: sErr := server.Shutdown(ctx) if sErr != nil { - return errs.Wrap(sErr, "shutdown err") + return errs.WrapMsg(sErr, "shutdown err") } close(shutdownDone) if err != nil { @@ -463,7 +463,7 @@ func (ws *WsServer) ParseWSArgs(r *http.Request) (args *WSArgs, err error) { case constant.KickedToken: return nil, errs.ErrTokenKicked.Wrap() default: - return nil, errs.ErrTokenUnknown.Wrap(fmt.Sprintf("token status is %d", v)) + return nil, errs.ErrTokenUnknown.WrapMsg(fmt.Sprintf("token status is %d", v)) } } else { return nil, errs.ErrTokenNotExist.Wrap() diff --git a/internal/msgtransfer/init.go b/internal/msgtransfer/init.go index 6f3d2fd3a..2b1e057d1 100644 --- a/internal/msgtransfer/init.go +++ b/internal/msgtransfer/init.go @@ -138,7 +138,7 @@ func (m *MsgTransfer) Start(prometheusPort int, config *config.GlobalConfig) err http.Handle("/metrics", promhttp.HandlerFor(proreg, promhttp.HandlerOpts{Registry: proreg})) err := http.ListenAndServe(fmt.Sprintf(":%d", prometheusPort), nil) if err != nil && err != http.ErrServerClosed { - netErr = errs.Wrap(err, fmt.Sprintf("prometheus start err: %d", prometheusPort)) + netErr = errs.WrapMsg(err, fmt.Sprintf("prometheus start err: %d", prometheusPort)) netDone <- struct{}{} } }()