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

log

Browse Source
This commit is contained in:
wangchuxiao 2023-01-12 17:49:36 +08:00
parent 57928f900e
commit 022da8bdbd
3 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
internal/rpc/cache/cache.go vendored
View File

@ -105,7 +105,6 @@ func (s *cacheServer) DelFriendIDListFromCache(ctx context.Context, req *pbCache
if err := rocksCache.DelFriendIDListFromCache(ctx, req.UserID); err != nil { if err := rocksCache.DelFriendIDListFromCache(ctx, req.UserID); err != nil {
return return
} }
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", resp.String())
return return
} }

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

@ -242,13 +242,11 @@ func ShowLog(ctx context.Context) {
OperationID := trace_log.GetOperationID(ctx) OperationID := trace_log.GetOperationID(ctx)
if ctx.Value(trace_log.TraceLogKey).(*trace_log.ApiInfo).GinCtx != nil { if ctx.Value(trace_log.TraceLogKey).(*trace_log.ApiInfo).GinCtx != nil {
ctxLogger.WithFields(logrus.Fields{ ctxLogger.WithFields(logrus.Fields{
"Type": ctxLogger.Type,
"OperationID": OperationID, "OperationID": OperationID,
"PID": ctxLogger.Pid, "PID": ctxLogger.Pid,
}).Infoln("api: ", t.ApiName) }).Infoln("api: ", t.ApiName)
} else { } else {
ctxLogger.WithFields(logrus.Fields{ ctxLogger.WithFields(logrus.Fields{
"Type": ctxLogger.Type,
"OperationID": OperationID, "OperationID": OperationID,
"PID": ctxLogger.Pid, "PID": ctxLogger.Pid,
}).Infoln("rpc: ", t.ApiName) }).Infoln("rpc: ", t.ApiName)
@ -256,7 +254,6 @@ func ShowLog(ctx context.Context) {
for _, v := range *t.Funcs { for _, v := range *t.Funcs {
if v.Err != nil { if v.Err != nil {
ctxLogger.WithFields(logrus.Fields{ ctxLogger.WithFields(logrus.Fields{
"Type": v.File,
"OperationID": OperationID, "OperationID": OperationID,
"PID": ctxLogger.Pid, "PID": ctxLogger.Pid,
"FilePath": v.File, "FilePath": v.File,
@ -265,21 +262,18 @@ func ShowLog(ctx context.Context) {
switch v.LogLevel { switch v.LogLevel {
case logrus.InfoLevel: case logrus.InfoLevel:
ctxLogger.WithFields(logrus.Fields{ ctxLogger.WithFields(logrus.Fields{
"Type": v.File,
"OperationID": OperationID, "OperationID": OperationID,
"PID": ctxLogger.Pid, "PID": ctxLogger.Pid,
"FilePath": v.File, "FilePath": v.File,
}).Infoln("func: ", v.FuncName, " args: ", v.Args) }).Infoln("func: ", v.FuncName, " args: ", v.Args)
case logrus.DebugLevel: case logrus.DebugLevel:
ctxLogger.WithFields(logrus.Fields{ ctxLogger.WithFields(logrus.Fields{
"Type": v.File,
"OperationID": OperationID, "OperationID": OperationID,
"PID": ctxLogger.Pid, "PID": ctxLogger.Pid,
"FilePath": v.File, "FilePath": v.File,
}).Debugln("func: ", v.FuncName, " args: ", v.Args) }).Debugln("func: ", v.FuncName, " args: ", v.Args)
case logrus.WarnLevel: case logrus.WarnLevel:
ctxLogger.WithFields(logrus.Fields{ ctxLogger.WithFields(logrus.Fields{
"Type": v.File,
"OperationID": OperationID, "OperationID": OperationID,
"PID": ctxLogger.Pid, "PID": ctxLogger.Pid,
"FilePath": v.File, "FilePath": v.File,

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

@ -179,11 +179,11 @@ 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(2) _, file, line, _ := runtime.Caller(3)
var s string var s string
i := strings.SplitAfter(file, "/") i := strings.SplitAfter(file, "/")
if len(i) > 3 { if len(i) > 3 {
file = i[len(i)-3] + i[len(i)-2] + i[len(i)-1] + ":" + utils.IntToString(line) s = i[len(i)-3] + i[len(i)-2] + i[len(i)-1] + ":" + utils.IntToString(line)
} }
fmt.Println(funcInfo.FuncName, "file", s, file) fmt.Println(funcInfo.FuncName, "file", s, file)
funcInfo.File = s funcInfo.File = s