From 022da8bdbd2494d2ba0a2456c9d294c245f4fa1e Mon Sep 17 00:00:00 2001
From: wangchuxiao <wangchuxiao97@outlook.com>
Date: Thu, 12 Jan 2023 17:49:36 +0800
Subject: [PATCH] log

---
 internal/rpc/cache/cache.go | 1 -
 pkg/common/log/logrus.go    | 6 ------
 pkg/common/trace_log/ctx.go | 4 ++--
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/internal/rpc/cache/cache.go b/internal/rpc/cache/cache.go
index 7c445f741..1483ca4a8 100644
--- a/internal/rpc/cache/cache.go
+++ b/internal/rpc/cache/cache.go
@@ -105,7 +105,6 @@ func (s *cacheServer) DelFriendIDListFromCache(ctx context.Context, req *pbCache
 	if err := rocksCache.DelFriendIDListFromCache(ctx, req.UserID); err != nil {
 		return
 	}
-	log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", resp.String())
 	return
 }
 
diff --git a/pkg/common/log/logrus.go b/pkg/common/log/logrus.go
index adb6a05f7..8a0b22633 100644
--- a/pkg/common/log/logrus.go
+++ b/pkg/common/log/logrus.go
@@ -242,13 +242,11 @@ func ShowLog(ctx context.Context) {
 	OperationID := trace_log.GetOperationID(ctx)
 	if ctx.Value(trace_log.TraceLogKey).(*trace_log.ApiInfo).GinCtx != nil {
 		ctxLogger.WithFields(logrus.Fields{
-			"Type":        ctxLogger.Type,
 			"OperationID": OperationID,
 			"PID":         ctxLogger.Pid,
 		}).Infoln("api: ", t.ApiName)
 	} else {
 		ctxLogger.WithFields(logrus.Fields{
-			"Type":        ctxLogger.Type,
 			"OperationID": OperationID,
 			"PID":         ctxLogger.Pid,
 		}).Infoln("rpc: ", t.ApiName)
@@ -256,7 +254,6 @@ func ShowLog(ctx context.Context) {
 	for _, v := range *t.Funcs {
 		if v.Err != nil {
 			ctxLogger.WithFields(logrus.Fields{
-				"Type":        v.File,
 				"OperationID": OperationID,
 				"PID":         ctxLogger.Pid,
 				"FilePath":    v.File,
@@ -265,21 +262,18 @@ func ShowLog(ctx context.Context) {
 			switch v.LogLevel {
 			case logrus.InfoLevel:
 				ctxLogger.WithFields(logrus.Fields{
-					"Type":        v.File,
 					"OperationID": OperationID,
 					"PID":         ctxLogger.Pid,
 					"FilePath":    v.File,
 				}).Infoln("func: ", v.FuncName, " args: ", v.Args)
 			case logrus.DebugLevel:
 				ctxLogger.WithFields(logrus.Fields{
-					"Type":        v.File,
 					"OperationID": OperationID,
 					"PID":         ctxLogger.Pid,
 					"FilePath":    v.File,
 				}).Debugln("func: ", v.FuncName, " args: ", v.Args)
 			case logrus.WarnLevel:
 				ctxLogger.WithFields(logrus.Fields{
-					"Type":        v.File,
 					"OperationID": OperationID,
 					"PID":         ctxLogger.Pid,
 					"FilePath":    v.File,
diff --git a/pkg/common/trace_log/ctx.go b/pkg/common/trace_log/ctx.go
index dc5b5873a..d73d1fd0d 100644
--- a/pkg/common/trace_log/ctx.go
+++ b/pkg/common/trace_log/ctx.go
@@ -179,11 +179,11 @@ func SetContextInfo(ctx context.Context, funcName string, logLevel logrus.Level,
 	funcInfo.FuncName = funcName
 	funcInfo.Err = err
 	funcInfo.LogLevel = logLevel
-	_, file, line, _ := runtime.Caller(2)
+	_, file, line, _ := runtime.Caller(3)
 	var s string
 	i := strings.SplitAfter(file, "/")
 	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)
 	funcInfo.File = s