blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-05-02 15:56:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/errcode' into errcode

Browse Source
This commit is contained in:
skiffer-git 2023-01-12 17:31:13 +08:00
commit ba81f0e4b9
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
internal/rpc/group/group.go
View File

@ -740,7 +740,8 @@ func (s *groupServer) GroupApplicationResponse(ctx context.Context, req *pbGroup
} else if req.HandleResult == constant.GroupResponseRefuse { } else if req.HandleResult == constant.GroupResponseRefuse {
chat.GroupApplicationRejectedNotification(req) chat.GroupApplicationRejectedNotification(req)
} else { } else {
return nil, utils.Wrap(constant.ErrArgs, "") //return nil, utils.Wrap(constant.ErrArgs, "")
return nil, constant.ErrArgs.Warp()
} }
return resp, nil return resp, nil
} }

7
pkg/common/constant/err_info.go
View File

@ -2,11 +2,10 @@ package constant
import ( import (
sdkws "Open_IM/pkg/proto/sdk_ws" sdkws "Open_IM/pkg/proto/sdk_ws"
"Open_IM/pkg/utils"
"context" "context"
"encoding/json" "encoding/json"
"errors"
"fmt" "fmt"
"github.com/pkg/errors"
"gorm.io/gorm" "gorm.io/gorm"
) )
@ -25,11 +24,11 @@ func (e *ErrInfo) Code() int32 {
} }
func (e *ErrInfo) Warp() error { func (e *ErrInfo) Warp() error {
return utils.Wrap(e, "") return errors.WithStack(e)
} }
func (e *ErrInfo) WarpMessage(msg string) error { func (e *ErrInfo) WarpMessage(msg string) error {
return utils.Wrap(e, msg) return errors.WithMessage(e, "")
} }
func NewErrNetwork(err error) error { func NewErrNetwork(err error) error {

2
pkg/common/log/logrus.go
View File

@ -33,7 +33,7 @@ func init() {
func NewPrivateLog(moduleName string) { func NewPrivateLog(moduleName string) {
logger = loggerInit(moduleName) logger = loggerInit(moduleName)
ctxLogger = loggerInit(moduleName) ctxLogger = ctxLoggerInit(moduleName)
} }
func ctxLoggerInit(moduleName string) *Logger { func ctxLoggerInit(moduleName string) *Logger {

2
pkg/common/trace_log/ctx.go
View File

@ -179,7 +179,7 @@ func SetContextInfo(ctx context.Context, funcName string, logLevel logrus.Level,
funcInfo.FuncName = funcName funcInfo.FuncName = funcName
funcInfo.Err = err funcInfo.Err = err
funcInfo.LogLevel = logLevel funcInfo.LogLevel = logLevel
_, file, line, _ := runtime.Caller(0) _, file, line, _ := runtime.Caller(2)
var s string var s string
i := strings.SplitAfter(file, "/") i := strings.SplitAfter(file, "/")
if len(i) > 3 { if len(i) > 3 {