From 26ed14d1d3ababc5bf39d9704aefcf90d32d4933 Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Mon, 30 Jan 2023 11:14:18 +0800 Subject: [PATCH] errcode --- internal/api/group/group.go | 8 ++-- internal/api_to_rpc/api.go | 2 +- internal/rpc/friend/friend.go | 2 +- internal/rpc/group/callback.go | 2 +- internal/rpc/group/group.go | 42 +++++++++---------- pkg/common/db/cache/group.go | 2 +- pkg/common/db/cache/rockscache.go | 6 +-- pkg/common/db/relation/black.go | 2 +- pkg/common/db/relation/friend_model_k.go | 2 +- .../db/relation/friend_request_model.go | 2 +- .../db/relation/group_member_model_k.go | 1 - .../db/relation/group_request_model_k.go | 2 +- pkg/common/db/relation/user_model_k.go | 6 +-- pkg/common/log/logrus.go | 4 +- pkg/common/middleware/rpc.go | 2 +- pkg/common/token_verify/jwt_token.go | 2 +- pkg/common/tracelog/ctx.go | 2 +- pkg/getcdv3/temp.go | 1 - 18 files changed, 44 insertions(+), 46 deletions(-) diff --git a/internal/api/group/group.go b/internal/api/group/group.go index ed7841547..f217923c7 100644 --- a/internal/api/group/group.go +++ b/internal/api/group/group.go @@ -7,7 +7,7 @@ import ( "Open_IM/pkg/common/constant" "Open_IM/pkg/common/log" "Open_IM/pkg/common/token_verify" - "Open_IM/pkg/common/trace_log" + "Open_IM/pkg/common/tracelog" "Open_IM/pkg/getcdv3" rpc "Open_IM/pkg/proto/group" "Open_IM/pkg/utils" @@ -1010,7 +1010,7 @@ func CancelMuteGroupMember(c *gin.Context) { //var err error //if err, req.OpUserID, _ = token_verify.ParseUserIDFromToken(c.Request.Header.Get("token"), req.OperationID); err != nil { - // trace_log.WriteErrorResponse(nCtx, "ParseUserIDFromToken", err) + // tracelog.WriteErrorResponse(nCtx, "ParseUserIDFromToken", err) // return //} tracelog.SetCtxInfo(nCtx, "ParseUserIDFromToken", nil, "token", c.Request.Header.Get("token"), "OpUserID", req.OpUserID) @@ -1269,7 +1269,7 @@ func GetGroupAbstractInfo(c *gin.Context) { //req api.GetGroupAbstractInfoReq //resp api.GetGroupAbstractInfoResp //) - //nCtx := trace_log.NewCtx(c, utils.GetSelfFuncName()) + //nCtx := tracelog.NewCtx(c, utils.GetSelfFuncName()) //if err := c.BindJSON(&req); err != nil { // log.NewError("0", "BindJSON failed ", err.Error()) // c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) @@ -1301,7 +1301,7 @@ func GetGroupAbstractInfo(c *gin.Context) { //if err != nil { // //log.NewError(req.OperationID, utils.GetSelfFuncName(), " failed ", err.Error()) // //c.JSON(http.StatusInternalServerError, gin.H{"errCode": 500, "errMsg": err.Error()}) - // trace_log.WriteErrorResponse(nCtx, "GetGroupAbstractInfo", utils.Wrap(err, "")) + // tracelog.WriteErrorResponse(nCtx, "GetGroupAbstractInfo", utils.Wrap(err, "")) // return //} //resp.GroupMemberNumber = respPb.GroupMemberNumber diff --git a/internal/api_to_rpc/api.go b/internal/api_to_rpc/api.go index 87bfefade..43118ca16 100644 --- a/internal/api_to_rpc/api.go +++ b/internal/api_to_rpc/api.go @@ -2,7 +2,7 @@ package common import ( "Open_IM/pkg/common/log" - "Open_IM/pkg/common/trace_log" + "Open_IM/pkg/common/tracelog" "Open_IM/pkg/getcdv3" utils2 "Open_IM/pkg/utils" "context" diff --git a/internal/rpc/friend/friend.go b/internal/rpc/friend/friend.go index 7e1e78319..50c8b43e5 100644 --- a/internal/rpc/friend/friend.go +++ b/internal/rpc/friend/friend.go @@ -11,7 +11,7 @@ import ( promePkg "Open_IM/pkg/common/prometheus" "Open_IM/pkg/common/token_verify" "Open_IM/pkg/common/tools" - "Open_IM/pkg/common/trace_log" + "Open_IM/pkg/common/tracelog" "Open_IM/pkg/getcdv3" pbFriend "Open_IM/pkg/proto/friend" sdkws "Open_IM/pkg/proto/sdk_ws" diff --git a/internal/rpc/group/callback.go b/internal/rpc/group/callback.go index 1d44bd8be..cd964af53 100644 --- a/internal/rpc/group/callback.go +++ b/internal/rpc/group/callback.go @@ -7,7 +7,7 @@ import ( relation "Open_IM/pkg/common/db/mysql" "Open_IM/pkg/common/http" "Open_IM/pkg/common/log" - "Open_IM/pkg/common/trace_log" + "Open_IM/pkg/common/tracelog" pbGroup "Open_IM/pkg/proto/group" "Open_IM/pkg/utils" "context" diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index a37f7ebe1..284ba2eb7 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -14,7 +14,7 @@ import ( promePkg "Open_IM/pkg/common/prometheus" "Open_IM/pkg/common/token_verify" "Open_IM/pkg/common/tools" - "Open_IM/pkg/common/trace_log" + "Open_IM/pkg/common/tracelog" cp "Open_IM/internal/utils" "Open_IM/pkg/getcdv3" @@ -466,23 +466,23 @@ func (s *groupServer) KickGroupMember(ctx context.Context, req *pbGroup.KickGrou kickedInfo, err := rocksCache.GetGroupMemberInfoFromCache(ctx, req.GroupID, v) if err != nil { resp.Id2ResultList = append(resp.Id2ResultList, &pbGroup.Id2Result{UserID: v, Result: -1}) - trace_log.SetCtxInfo(ctx, "GetGroupMemberInfoFromCache", err, "groupID", req.GroupID, "userID", v) + tracelog.SetCtxInfo(ctx, "GetGroupMemberInfoFromCache", err, "groupID", req.GroupID, "userID", v) continue } if kickedInfo.RoleLevel == constant.GroupAdmin && opFlag == 3 { resp.Id2ResultList = append(resp.Id2ResultList, &pbGroup.Id2Result{UserID: v, Result: -1}) - trace_log.SetCtxInfo(ctx, "", nil, "msg", "is constant.GroupAdmin, can't kicked", "groupID", req.GroupID, "userID", v) + tracelog.SetCtxInfo(ctx, "", nil, "msg", "is constant.GroupAdmin, can't kicked", "groupID", req.GroupID, "userID", v) continue } if kickedInfo.RoleLevel == constant.GroupOwner && opFlag != 1 { resp.Id2ResultList = append(resp.Id2ResultList, &pbGroup.Id2Result{UserID: v, Result: -1}) - trace_log.SetCtxInfo(ctx, "", nil, "msg", "is constant.GroupOwner, can't kicked", "groupID", req.GroupID, "userID", v) + tracelog.SetCtxInfo(ctx, "", nil, "msg", "is constant.GroupOwner, can't kicked", "groupID", req.GroupID, "userID", v) continue } err = relation.DeleteGroupMemberByGroupIDAndUserID(req.GroupID, v) - trace_log.SetCtxInfo(ctx, "RemoveGroupMember", err, "groupID", req.GroupID, "userID", v) + tracelog.SetCtxInfo(ctx, "RemoveGroupMember", err, "groupID", req.GroupID, "userID", v) if err != nil { log.NewError(tools.OperationID(ctx), "RemoveGroupMember failed ", err.Error(), req.GroupID, v) resp.Id2ResultList = append(resp.Id2ResultList, &pbGroup.Id2Result{UserID: v, Result: -1}) @@ -507,7 +507,7 @@ func (s *groupServer) KickGroupMember(ctx context.Context, req *pbGroup.KickGrou } client := pbUser.NewUserClient(etcdConn) respPb, err := client.SetConversation(context.Background(), &reqPb) - trace_log.SetCtxInfo(ctx, "SetConversation", err, "req", &reqPb, "resp", respPb) + tracelog.SetCtxInfo(ctx, "SetConversation", err, "req", &reqPb, "resp", respPb) } } else { okUserIDList = req.KickedUserIDList @@ -519,14 +519,14 @@ func (s *groupServer) KickGroupMember(ctx context.Context, req *pbGroup.KickGrou if groupInfo.GroupType != constant.SuperGroup { for _, userID := range okUserIDList { if err := rocksCache.DelGroupMemberInfoFromCache(ctx, req.GroupID, userID); err != nil { - trace_log.SetCtxInfo(ctx, "DelGroupMemberInfoFromCache", err, "groupID", req.GroupID, "userID", userID) + tracelog.SetCtxInfo(ctx, "DelGroupMemberInfoFromCache", err, "groupID", req.GroupID, "userID", userID) } } chat.MemberKickedNotification(req, okUserIDList) } else { for _, userID := range okUserIDList { if err = rocksCache.DelJoinedSuperGroupIDListFromCache(ctx, userID); err != nil { - trace_log.SetCtxInfo(ctx, "DelGroupMemberInfoFromCache", err, "userID", userID) + tracelog.SetCtxInfo(ctx, "DelGroupMemberInfoFromCache", err, "userID", userID) } } go func() { @@ -584,7 +584,7 @@ func (s *groupServer) GetGroupApplicationList(ctx context.Context, req *pbGroup. return nil, err } var errResult error - trace_log.SetCtxInfo(ctx, "GetRecvGroupApplicationList", nil, " FromUserID: ", req.FromUserID, "GroupApplicationList: ", reply) + tracelog.SetCtxInfo(ctx, "GetRecvGroupApplicationList", nil, " FromUserID: ", req.FromUserID, "GroupApplicationList: ", reply) for _, v := range reply { node := open_im_sdk.GroupRequest{UserInfo: &open_im_sdk.PublicUserInfo{}, GroupInfo: &open_im_sdk.GroupInfo{}} err := FillGroupInfoByGroupID(tools.OperationID(ctx), v.GroupID, node.GroupInfo) @@ -594,7 +594,7 @@ func (s *groupServer) GetGroupApplicationList(ctx context.Context, req *pbGroup. } continue } - trace_log.SetCtxInfo(ctx, "FillGroupInfoByGroupID ", nil, " groupID: ", v.GroupID, " groupInfo: ", node.GroupInfo) + tracelog.SetCtxInfo(ctx, "FillGroupInfoByGroupID ", nil, " groupID: ", v.GroupID, " groupInfo: ", node.GroupInfo) err = FillPublicUserInfoByUserID(tools.OperationID(ctx), v.UserID, node.UserInfo) if err != nil { errResult = err @@ -606,7 +606,7 @@ func (s *groupServer) GetGroupApplicationList(ctx context.Context, req *pbGroup. if errResult != nil && len(resp.GroupRequestList) == 0 { return nil, err } - trace_log.SetRpcRespInfo(ctx, utils.GetSelfFuncName(), resp.String()) + tracelog.SetRpcRespInfo(ctx, utils.GetSelfFuncName(), resp.String()) return resp, nil } @@ -629,7 +629,7 @@ func (s *groupServer) GetGroupsInfo(ctx context.Context, req *pbGroup.GetGroupsI func CheckPermission(ctx context.Context, groupID string, userID string) (err error) { defer func() { - trace_log.SetCtxInfo(ctx, utils.GetSelfFuncName(), err, "groupID", groupID, "userID", userID) + tracelog.SetCtxInfo(ctx, utils.GetSelfFuncName(), err, "groupID", groupID, "userID", userID) }() if !token_verify.IsManagerUserID(userID) && !relation.IsGroupOwnerAdmin(groupID, userID) { return utils.Wrap(constant.ErrNoPermission, utils.GetSelfFuncName()) @@ -749,7 +749,7 @@ func (s *groupServer) JoinGroup(ctx context.Context, req *pbGroup.JoinGroupReq) } client := pbUser.NewUserClient(etcdConn) respPb, err := client.SetConversation(context.Background(), &reqPb) - trace_log.SetCtxInfo(ctx, "SetConversation", err, "req", reqPb, "resp", respPb) + tracelog.SetCtxInfo(ctx, "SetConversation", err, "req", reqPb, "resp", respPb) chat.MemberEnterDirectlyNotification(req.GroupID, tools.OpUserID(ctx), tools.OperationID(ctx)) return resp, nil } else { @@ -917,7 +917,7 @@ func (s *groupServer) SetGroupInfo(ctx context.Context, req *pbGroup.SetGroupInf } nClient := pbConversation.NewConversationClient(nEtcdConn) conversationReply, err := nClient.ModifyConversationField(context.Background(), &conversationReq) - trace_log.SetCtxInfo(ctx, "ModifyConversationField", err, "req", &conversationReq, "resp", conversationReply) + tracelog.SetCtxInfo(ctx, "ModifyConversationField", err, "req", &conversationReq, "resp", conversationReply) } return resp, nil } @@ -990,14 +990,14 @@ func (s *groupServer) GetGroups(ctx context.Context, req *pbGroup.GetGroupsReq) } else { groups, count, err := relation.GetGroupsByName(req.GroupName, req.Pagination.PageNumber, req.Pagination.ShowNumber) if err != nil { - trace_log.SetCtxInfo(ctx, "GetGroupsByName", err, "GroupName", req.GroupName, "PageNumber", req.Pagination.PageNumber, "ShowNumber", req.Pagination.ShowNumber) + tracelog.SetCtxInfo(ctx, "GetGroupsByName", err, "GroupName", req.GroupName, "PageNumber", req.Pagination.PageNumber, "ShowNumber", req.Pagination.ShowNumber) } for _, v := range groups { group := &pbGroup.CMSGroup{GroupInfo: &open_im_sdk.GroupInfo{}} utils.CopyStructFields(group.GroupInfo, v) groupMember, err := relation.GetGroupOwnerInfoByGroupID(v.GroupID) if err != nil { - trace_log.SetCtxInfo(ctx, "GetGroupOwnerInfoByGroupID", err, "GroupID", v.GroupID) + tracelog.SetCtxInfo(ctx, "GetGroupOwnerInfoByGroupID", err, "GroupID", v.GroupID) continue } group.GroupInfo.CreateTime = uint32(v.CreateTime.Unix()) @@ -1046,12 +1046,12 @@ func (s *groupServer) GetUserReqApplicationList(ctx context.Context, req *pbGrou node := open_im_sdk.GroupRequest{UserInfo: &open_im_sdk.PublicUserInfo{}, GroupInfo: &open_im_sdk.GroupInfo{}} group, err := relation.GetGroupInfoByGroupID(groupReq.GroupID) if err != nil { - trace_log.SetCtxInfo(ctx, "GetGroupInfoByGroupID", err, "GroupID", groupReq.GroupID) + tracelog.SetCtxInfo(ctx, "GetGroupInfoByGroupID", err, "GroupID", groupReq.GroupID) continue } user, err := relation.GetUserByUserID(groupReq.UserID) if err != nil { - trace_log.SetCtxInfo(ctx, "GetUserByUserID", err, "UserID", groupReq.UserID) + tracelog.SetCtxInfo(ctx, "GetUserByUserID", err, "UserID", groupReq.UserID) continue } cp.GroupRequestDBCopyOpenIM(&node, &groupReq) @@ -1087,7 +1087,7 @@ func (s *groupServer) DismissGroup(ctx context.Context, req *pbGroup.DismissGrou if groupInfo.GroupType != constant.SuperGroup { memberList, err := relation.GetGroupMemberListByGroupID(req.GroupID) if err != nil { - trace_log.SetCtxInfo(ctx, "GetGroupMemberListByGroupID", err, "groupID", req.GroupID) + tracelog.SetCtxInfo(ctx, "GetGroupMemberListByGroupID", err, "groupID", req.GroupID) } //modify quitter conversation info var reqPb pbUser.SetConversationReq @@ -1103,7 +1103,7 @@ func (s *groupServer) DismissGroup(ctx context.Context, req *pbGroup.DismissGrou etcdConn, err := getcdv3.GetConn(ctx, config.Config.RpcRegisterName.OpenImUserName) client := pbUser.NewUserClient(etcdConn) respPb, err := client.SetConversation(context.Background(), &reqPb) - trace_log.SetCtxInfo(ctx, "SetConversation", err, "req", &reqPb, "resp", respPb) + tracelog.SetCtxInfo(ctx, "SetConversation", err, "req", &reqPb, "resp", respPb) } err = relation.DeleteGroupMemberByGroupID(req.GroupID) if err != nil { @@ -1366,7 +1366,7 @@ func (s *groupServer) GetGroupAbstractInfo(ctx context.Context, req *pbGroup.Get } func (s *groupServer) DelGroupAndUserCache(ctx context.Context, groupID string, userIDList []string) error { - operationID := trace_log.GetOperationID(ctx) + operationID := tracelog.GetOperationID(ctx) if groupID != "" { etcdConn, err := getcdv3.GetConn(ctx, config.Config.RpcRegisterName.OpenImCacheName) if err != nil { diff --git a/pkg/common/db/cache/group.go b/pkg/common/db/cache/group.go index 2d975d52e..960a2b41c 100644 --- a/pkg/common/db/cache/group.go +++ b/pkg/common/db/cache/group.go @@ -2,7 +2,7 @@ package cache import ( "Open_IM/pkg/common/db/relation" - "Open_IM/pkg/common/trace_log" + "Open_IM/pkg/common/tracelog" "Open_IM/pkg/utils" "context" "encoding/json" diff --git a/pkg/common/db/cache/rockscache.go b/pkg/common/db/cache/rockscache.go index d7b51395f..ecd975db4 100644 --- a/pkg/common/db/cache/rockscache.go +++ b/pkg/common/db/cache/rockscache.go @@ -5,7 +5,7 @@ import ( "Open_IM/pkg/common/db/mongo" "Open_IM/pkg/common/db/mysql" "Open_IM/pkg/common/log" - "Open_IM/pkg/common/trace_log" + "Open_IM/pkg/common/tracelog" "Open_IM/pkg/utils" "context" "encoding/json" @@ -370,7 +370,7 @@ func DelAllGroupMembersInfoFromCache(ctx context.Context, groupID string) (err e // } // groupInfo = &mysql.Group{} // defer func() { -// trace_log.SetCtxDebug(ctx, utils.GetFuncName(1), err, "groupID", groupID, "groupInfo", groupInfo) +// tracelog.SetCtxDebug(ctx, utils.GetFuncName(1), err, "groupID", groupID, "groupInfo", groupInfo) // }() // groupInfoStr, err := db.DB.Rc.Fetch(groupInfoCache+groupID, time.Second*30*60, getGroupInfo) // if err != nil { @@ -382,7 +382,7 @@ func DelAllGroupMembersInfoFromCache(ctx context.Context, groupID string) (err e // //func DelGroupInfoFromCache(ctx context.Context, groupID string) (err error) { // defer func() { -// trace_log.SetCtxDebug(ctx, utils.GetFuncName(1), err, "groupID", groupID) +// tracelog.SetCtxDebug(ctx, utils.GetFuncName(1), err, "groupID", groupID) // }() // return db.DB.Rc.TagAsDeleted(groupInfoCache + groupID) //} diff --git a/pkg/common/db/relation/black.go b/pkg/common/db/relation/black.go index 0570d2c15..3f1faa32e 100644 --- a/pkg/common/db/relation/black.go +++ b/pkg/common/db/relation/black.go @@ -1,7 +1,7 @@ package relation import ( - "Open_IM/pkg/common/trace_log" + "Open_IM/pkg/common/tracelog" "Open_IM/pkg/utils" "context" "gorm.io/gorm" diff --git a/pkg/common/db/relation/friend_model_k.go b/pkg/common/db/relation/friend_model_k.go index ee881b3e5..26f1fd006 100644 --- a/pkg/common/db/relation/friend_model_k.go +++ b/pkg/common/db/relation/friend_model_k.go @@ -1,7 +1,7 @@ package relation import ( - "Open_IM/pkg/common/trace_log" + "Open_IM/pkg/common/tracelog" "Open_IM/pkg/utils" "context" "gorm.io/gorm" diff --git a/pkg/common/db/relation/friend_request_model.go b/pkg/common/db/relation/friend_request_model.go index cc2877d72..aae25a33a 100644 --- a/pkg/common/db/relation/friend_request_model.go +++ b/pkg/common/db/relation/friend_request_model.go @@ -1,7 +1,7 @@ package relation import ( - "Open_IM/pkg/common/trace_log" + "Open_IM/pkg/common/tracelog" "Open_IM/pkg/utils" "context" "gorm.io/gorm" diff --git a/pkg/common/db/relation/group_member_model_k.go b/pkg/common/db/relation/group_member_model_k.go index b8f46915f..c02474eea 100644 --- a/pkg/common/db/relation/group_member_model_k.go +++ b/pkg/common/db/relation/group_member_model_k.go @@ -2,7 +2,6 @@ package relation import ( "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/trace_log" "Open_IM/pkg/common/tracelog" "Open_IM/pkg/utils" "context" diff --git a/pkg/common/db/relation/group_request_model_k.go b/pkg/common/db/relation/group_request_model_k.go index c6648151f..63014d06b 100644 --- a/pkg/common/db/relation/group_request_model_k.go +++ b/pkg/common/db/relation/group_request_model_k.go @@ -1,7 +1,7 @@ package relation import ( - "Open_IM/pkg/common/trace_log" + "Open_IM/pkg/common/tracelog" "Open_IM/pkg/utils" "context" "gorm.io/gorm" diff --git a/pkg/common/db/relation/user_model_k.go b/pkg/common/db/relation/user_model_k.go index 8bd0b1a34..c7dd8e778 100644 --- a/pkg/common/db/relation/user_model_k.go +++ b/pkg/common/db/relation/user_model_k.go @@ -1,7 +1,7 @@ package relation import ( - "Open_IM/pkg/common/trace_log" + "Open_IM/pkg/common/tracelog" "Open_IM/pkg/utils" "context" "fmt" @@ -73,7 +73,7 @@ func (u *User) Take(ctx context.Context, userID string) (user *User, err error) func (u *User) GetByName(ctx context.Context, userName string, showNumber, pageNumber int32) (users []*User, count int64, err error) { defer func() { - trace_log.SetCtxDebug(ctx, utils.GetFuncName(1), err, "userName", userName, "showNumber", showNumber, "pageNumber", pageNumber, "users", users, "count", count) + tracelog.SetCtxDebug(ctx, utils.GetFuncName(1), err, "userName", userName, "showNumber", showNumber, "pageNumber", pageNumber, "users", users, "count", count) }() err = u.DB.Where(" name like ?", fmt.Sprintf("%%%s%%", userName)).Limit(int(showNumber)).Offset(int(showNumber * pageNumber)).Find(&users).Error if err != nil { @@ -96,7 +96,7 @@ func (u *User) GetByNameAndID(ctx context.Context, content string, showNumber, p func (u *User) Get(ctx context.Context, showNumber, pageNumber int32) (users []*User, count int64, err error) { defer func() { - trace_log.SetCtxDebug(ctx, utils.GetFuncName(1), err, "showNumber", showNumber, "pageNumber", pageNumber, "users", users, "count", count) + tracelog.SetCtxDebug(ctx, utils.GetFuncName(1), err, "showNumber", showNumber, "pageNumber", pageNumber, "users", users, "count", count) }() err = u.DB.Model(u).Count(&count).Error if err != nil { diff --git a/pkg/common/log/logrus.go b/pkg/common/log/logrus.go index 99e7aa3ce..d3c4f37e7 100644 --- a/pkg/common/log/logrus.go +++ b/pkg/common/log/logrus.go @@ -2,7 +2,7 @@ package log import ( "Open_IM/pkg/common/config" - "Open_IM/pkg/common/trace_log" + "Open_IM/pkg/common/tracelog" "bufio" "context" //"bufio" @@ -239,7 +239,7 @@ func NewWarn(OperationID string, args ...interface{}) { func ShowLog(ctx context.Context) { t := ctx.Value(tracelog.TraceLogKey).(*tracelog.ApiInfo) OperationID := tracelog.GetOperationID(ctx) - //if ctx.Value(trace_log.TraceLogKey).(*trace_log.ApiInfo).GinCtx != nil { + //if ctx.Value(tracelog.TraceLogKey).(*tracelog.ApiInfo).GinCtx != nil { // ctxLogger.WithFields(logrus.Fields{ // "OperationID": OperationID, // "PID": ctxLogger.Pid, diff --git a/pkg/common/middleware/rpc.go b/pkg/common/middleware/rpc.go index c6f6b7d1f..755348153 100644 --- a/pkg/common/middleware/rpc.go +++ b/pkg/common/middleware/rpc.go @@ -3,7 +3,7 @@ package middleware import ( "Open_IM/pkg/common/constant" "Open_IM/pkg/common/log" - "Open_IM/pkg/common/trace_log" + "Open_IM/pkg/common/tracelog" "Open_IM/pkg/utils" "context" "fmt" diff --git a/pkg/common/token_verify/jwt_token.go b/pkg/common/token_verify/jwt_token.go index 6858cb113..9f65b75ed 100644 --- a/pkg/common/token_verify/jwt_token.go +++ b/pkg/common/token_verify/jwt_token.go @@ -6,7 +6,7 @@ import ( commonDB "Open_IM/pkg/common/db" "Open_IM/pkg/common/log" "Open_IM/pkg/common/tools" - "Open_IM/pkg/common/trace_log" + "Open_IM/pkg/common/tracelog" "Open_IM/pkg/utils" "context" "time" diff --git a/pkg/common/tracelog/ctx.go b/pkg/common/tracelog/ctx.go index 284514b22..98f241787 100644 --- a/pkg/common/tracelog/ctx.go +++ b/pkg/common/tracelog/ctx.go @@ -15,7 +15,7 @@ import ( "net/http" ) -const TraceLogKey = "trace_log" +const TraceLogKey = "tracelog" func NewCtx(c *gin.Context, api string) context.Context { req := &ApiInfo{ApiName: api, GinCtx: c, Funcs: &[]FuncInfo{}} diff --git a/pkg/getcdv3/temp.go b/pkg/getcdv3/temp.go index d3c186890..797271264 100644 --- a/pkg/getcdv3/temp.go +++ b/pkg/getcdv3/temp.go @@ -3,7 +3,6 @@ package getcdv3 import ( "Open_IM/pkg/common/config" "Open_IM/pkg/common/constant" - "Open_IM/pkg/common/trace_log" "Open_IM/pkg/common/tracelog" "context" "github.com/OpenIMSDK/getcdv3"