blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-26 11:36:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

zap

Browse Source
This commit is contained in:
wangchuxiao 2023-03-14 12:07:25 +08:00
parent 23c2d81c2c
commit daffe8a7b7
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/common/log/zap.go
View File

@ -143,7 +143,14 @@ func (l *ZapLogger) Error(ctx context.Context, msg string, err error, keysAndVal
} }
func (l *ZapLogger) kvAppend(ctx context.Context, keysAndValues []interface{}) []interface{} { func (l *ZapLogger) kvAppend(ctx context.Context, keysAndValues []interface{}) []interface{} {
keysAndValues = append([]interface{}{constant.OperationID, tracelog.GetOperationID(ctx), constant.OpUserID, tracelog.GetOpUserID(ctx)}, keysAndValues...) operationID := tracelog.GetOperationID(ctx)
opUserID := tracelog.GetOpUserID(ctx)
if opUserID != "" {
keysAndValues = append([]interface{}{constant.OpUserID, tracelog.GetOpUserID(ctx)}, keysAndValues...)
}
if operationID != "" {
keysAndValues = append([]interface{}{constant.OperationID, tracelog.GetOperationID(ctx)}, keysAndValues...)
}
return keysAndValues return keysAndValues
} }

12
pkg/common/tracelog/ctx.go
View File

@ -1,6 +1,7 @@
package tracelog package tracelog
import ( import (
"OpenIM/pkg/common/constant"
"OpenIM/pkg/utils" "OpenIM/pkg/utils"
"context" "context"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
@ -40,12 +41,17 @@ func GetOperationID(ctx context.Context) string {
return f.OperationID return f.OperationID
} }
} }
return utils.GetFuncName(3) return ""
} }
func GetOpUserID(ctx context.Context) string { func GetOpUserID(ctx context.Context) string {
s, _ := ctx.Value("opUserID").(string) if ctx.Value(constant.OpUserID) != "" {
return s s, ok := ctx.Value(constant.OpUserID).(string)
if ok {
return s
}
}
return ""
} }
func Unwrap(err error) error { func Unwrap(err error) error {