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

pkg/common/constant/err_info.go

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

pkg/common/log/logrus.go

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

pkg/common/trace_log/ctx.go

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