From 93030964303f94e8d1c1a73d5ceaf00df0dce017 Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Tue, 10 May 2022 09:09:37 +0800 Subject: [PATCH] log change --- cmd/Open-IM-SDK-Core | 2 +- internal/api/chat/get_max_min_seq.go | 4 ---- internal/api/chat/pull_msg.go | 4 ++-- internal/api/chat/send_msg.go | 5 ++--- internal/api/manage/management_chat.go | 2 +- internal/demo/register/verify.go | 4 ++-- internal/msg_gateway/gate/logic.go | 2 +- internal/msg_gateway/gate/rpc_server.go | 3 +-- internal/msg_transfer/logic/history_msg_handler.go | 2 +- internal/msg_transfer/logic/persistent_msg_handler.go | 2 +- internal/push/logic/push_handler.go | 4 ++-- internal/push/logic/push_rpc_server.go | 3 +-- internal/rpc/admin_cms/admin_cms.go | 3 +-- internal/rpc/auth/auth.go | 3 +-- internal/rpc/cache/cache.go | 3 +-- internal/rpc/conversation/conversaion.go | 3 +-- internal/rpc/friend/firend.go | 3 +-- internal/rpc/group/group.go | 3 +-- internal/rpc/message_cms/message_cms.go | 3 +-- internal/rpc/msg/pull_message.go | 2 +- internal/rpc/msg/rpcChat.go | 3 +-- internal/rpc/office/office.go | 3 +-- internal/rpc/organization/organization.go | 3 +-- internal/rpc/statistics/statistics.go | 3 +-- internal/rpc/user/user.go | 3 +-- 25 files changed, 28 insertions(+), 47 deletions(-) diff --git a/cmd/Open-IM-SDK-Core b/cmd/Open-IM-SDK-Core index 588c9bb77..856ac29b7 160000 --- a/cmd/Open-IM-SDK-Core +++ b/cmd/Open-IM-SDK-Core @@ -1 +1 @@ -Subproject commit 588c9bb77b9bd89a9261964006568b8655233cb6 +Subproject commit 856ac29b7c59a722c339a37d509035d94db8451f diff --git a/internal/api/chat/get_max_min_seq.go b/internal/api/chat/get_max_min_seq.go index 95a4b1340..38379d4cc 100644 --- a/internal/api/chat/get_max_min_seq.go +++ b/internal/api/chat/get_max_min_seq.go @@ -35,10 +35,6 @@ func GetSeq(c *gin.Context) { pbData.UserID = params.SendID pbData.OperationID = params.OperationID grpcConn := getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImOfflineMessageName) - - if grpcConn == nil { - log.ErrorByKv("get grpcConn err", pbData.OperationID, "args", params) - } msgClient := pbMsg.NewChatClient(grpcConn) reply, err := msgClient.GetMaxAndMinSeq(context.Background(), &pbData) if err != nil { diff --git a/internal/api/chat/pull_msg.go b/internal/api/chat/pull_msg.go index 515e9b743..787ae7141 100644 --- a/internal/api/chat/pull_msg.go +++ b/internal/api/chat/pull_msg.go @@ -55,10 +55,10 @@ func PullMsgBySeqList(c *gin.Context) { msgClient := pbChat.NewChatClient(grpcConn) reply, err := msgClient.PullMessageBySeqList(context.Background(), &pbData) if err != nil { - log.ErrorByKv("PullMessageBySeqList error", pbData.OperationID, "err", err.Error()) + log.Error(pbData.OperationID, "PullMessageBySeqList error", err.Error()) return } - log.InfoByKv("rpc call success to PullMessageBySeqList", pbData.OperationID, "ReplyArgs", reply.String(), len(reply.List)) + log.NewInfo(pbData.OperationID, "rpc call success to PullMessageBySeqList", reply.String(), len(reply.List)) c.JSON(http.StatusOK, gin.H{ "errCode": reply.ErrCode, "errMsg": reply.ErrMsg, diff --git a/internal/api/chat/send_msg.go b/internal/api/chat/send_msg.go index a28dcd1ce..36ebd4181 100644 --- a/internal/api/chat/send_msg.go +++ b/internal/api/chat/send_msg.go @@ -63,13 +63,12 @@ func SendMsg(c *gin.Context) { if err := c.BindJSON(¶ms); err != nil { c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) log.ErrorByKv("json unmarshal err", "", "err", err.Error(), "data", c.PostForm("data")) + log.Error("0", "BindJSON failed ", err.Error()) return } token := c.Request.Header.Get("token") - - log.InfoByKv("api call success to sendMsgReq", params.OperationID, "Parameters", params) - + log.NewInfo(params.OperationID, "api call success to sendMsgReq", params) pbData := newUserSendMsgReq(token, ¶ms) log.Info("", "", "api SendMsg call start..., [data: %s]", pbData.String()) diff --git a/internal/api/manage/management_chat.go b/internal/api/manage/management_chat.go index e1c1bc0ff..d39aa6d16 100644 --- a/internal/api/manage/management_chat.go +++ b/internal/api/manage/management_chat.go @@ -166,7 +166,7 @@ func ManagementSendMsg(c *gin.Context) { } } - log.InfoByKv("Ws call success to ManagementSendMsgReq", params.OperationID, "Parameters", params) + log.NewInfo(params.OperationID, "Ws call success to ManagementSendMsgReq", params) pbData := newUserSendMsgReq(¶ms) log.Info("", "", "api ManagementSendMsg call start..., [data: %s]", pbData.String()) diff --git a/internal/demo/register/verify.go b/internal/demo/register/verify.go index 01fafbb92..fd16223e0 100644 --- a/internal/demo/register/verify.go +++ b/internal/demo/register/verify.go @@ -35,14 +35,14 @@ func Verify(c *gin.Context) { } if params.VerificationCode == config.Config.Demo.SuperCode { - log.InfoByKv("Super Code Verified successfully", account) + log.NewInfo(params.OperationID, "Super Code Verified successfully", account) data := make(map[string]interface{}) data["account"] = account data["verificationCode"] = params.VerificationCode c.JSON(http.StatusOK, gin.H{"errCode": constant.NoError, "errMsg": "Verified successfully!", "data": data}) return } - log.NewInfo("0", " params.VerificationCode != config.Config.Demo.SuperCode", params.VerificationCode, config.Config.Demo) + log.NewInfo(params.OperationID, " params.VerificationCode != config.Config.Demo.SuperCode", params.VerificationCode, config.Config.Demo) log.NewInfo(params.OperationID, "begin get form redis", account) if params.UsedFor == 0 { params.UsedFor = constant.VerificationCodeForRegister diff --git a/internal/msg_gateway/gate/logic.go b/internal/msg_gateway/gate/logic.go index b3b9e2b8f..e5f49dbc6 100644 --- a/internal/msg_gateway/gate/logic.go +++ b/internal/msg_gateway/gate/logic.go @@ -80,7 +80,7 @@ func (ws *WServer) getSeqReq(conn *UserConn, m *Req) { nReply.ErrMsg = err.Error() ws.getSeqResp(conn, m, nReply) } else { - log.InfoByKv("rpc call success to getSeqReq", rpcReq.OperationID, "replyData", rpcReply.String()) + log.NewInfo(rpcReq.OperationID, "rpc call success to getSeqReq", rpcReply.String()) ws.getSeqResp(conn, m, rpcReply) } } diff --git a/internal/msg_gateway/gate/rpc_server.go b/internal/msg_gateway/gate/rpc_server.go index ad3a2c4d4..555015bb7 100644 --- a/internal/msg_gateway/gate/rpc_server.go +++ b/internal/msg_gateway/gate/rpc_server.go @@ -43,8 +43,7 @@ func (r *RPCServer) run() { address := listenIP + ":" + strconv.Itoa(r.rpcPort) listener, err := net.Listen("tcp", address) if err != nil { - log.Error("", "fail to listening consumer failed ", err.Error(), address) - return + panic("listening err:" + err.Error() + r.rpcRegisterName) } defer listener.Close() srv := grpc.NewServer() diff --git a/internal/msg_transfer/logic/history_msg_handler.go b/internal/msg_transfer/logic/history_msg_handler.go index 91179ca0e..424edd4e2 100644 --- a/internal/msg_transfer/logic/history_msg_handler.go +++ b/internal/msg_transfer/logic/history_msg_handler.go @@ -111,7 +111,7 @@ func (HistoryConsumerHandler) Cleanup(_ sarama.ConsumerGroupSession) error { ret func (mc *HistoryConsumerHandler) ConsumeClaim(sess sarama.ConsumerGroupSession, claim sarama.ConsumerGroupClaim) error { for msg := range claim.Messages() { - log.InfoByKv("kafka get info to mongo", "", "msgTopic", msg.Topic, "msgPartition", msg.Partition, "msg", string(msg.Value)) + log.NewDebug("", "kafka get info to mongo", "msgTopic", msg.Topic, "msgPartition", msg.Partition, "msg", string(msg.Value)) mc.msgHandle[msg.Topic](msg.Value, string(msg.Key)) sess.MarkMessage(msg, "") } diff --git a/internal/msg_transfer/logic/persistent_msg_handler.go b/internal/msg_transfer/logic/persistent_msg_handler.go index 36b336469..6e330a664 100644 --- a/internal/msg_transfer/logic/persistent_msg_handler.go +++ b/internal/msg_transfer/logic/persistent_msg_handler.go @@ -70,7 +70,7 @@ func (PersistentConsumerHandler) Cleanup(_ sarama.ConsumerGroupSession) error { func (pc *PersistentConsumerHandler) ConsumeClaim(sess sarama.ConsumerGroupSession, claim sarama.ConsumerGroupClaim) error { for msg := range claim.Messages() { - log.InfoByKv("kafka get info to mysql", "", "msgTopic", msg.Topic, "msgPartition", msg.Partition, "msg", string(msg.Value)) + log.NewDebug("", "kafka get info to mysql", "msgTopic", msg.Topic, "msgPartition", msg.Partition, "msg", string(msg.Value)) pc.msgHandle[msg.Topic](msg.Value, string(msg.Key)) sess.MarkMessage(msg, "") } diff --git a/internal/push/logic/push_handler.go b/internal/push/logic/push_handler.go index 294c48f15..192a9c400 100644 --- a/internal/push/logic/push_handler.go +++ b/internal/push/logic/push_handler.go @@ -31,7 +31,7 @@ func (ms *PushConsumerHandler) Init() { config.Config.Kafka.ConsumerGroupID.MsgToPush) } func (ms *PushConsumerHandler) handleMs2PsChat(msg []byte) { - log.InfoByKv("msg come from kafka And push!!!", "", "msg", string(msg)) + log.NewDebug("", "msg come from kafka And push!!!", "msg", string(msg)) msgFromMQ := pbChat.PushMsgDataToMQ{} if err := proto.Unmarshal(msg, &msgFromMQ); err != nil { log.ErrorByKv("push Unmarshal msg err", "", "msg", string(msg), "err", err.Error()) @@ -45,7 +45,7 @@ func (PushConsumerHandler) Cleanup(_ sarama.ConsumerGroupSession) error { return func (ms *PushConsumerHandler) ConsumeClaim(sess sarama.ConsumerGroupSession, claim sarama.ConsumerGroupClaim) error { for msg := range claim.Messages() { - log.InfoByKv("kafka get info to mysql", "", "msgTopic", msg.Topic, "msgPartition", msg.Partition, "msg", string(msg.Value)) + log.NewDebug("", "kafka get info to mysql", "msgTopic", msg.Topic, "msgPartition", msg.Partition, "msg", string(msg.Value)) ms.msgHandle[msg.Topic](msg.Value) } return nil diff --git a/internal/push/logic/push_rpc_server.go b/internal/push/logic/push_rpc_server.go index a33ba68b5..ba656a7d0 100644 --- a/internal/push/logic/push_rpc_server.go +++ b/internal/push/logic/push_rpc_server.go @@ -37,8 +37,7 @@ func (r *RPCServer) run() { listener, err := net.Listen("tcp", address) if err != nil { - log.Error("", "push module rpc listening port err", err.Error(), address) - return + panic("listening err:" + err.Error() + r.rpcRegisterName) } defer listener.Close() srv := grpc.NewServer() diff --git a/internal/rpc/admin_cms/admin_cms.go b/internal/rpc/admin_cms/admin_cms.go index 3a3f7dffd..a1aa96e9b 100644 --- a/internal/rpc/admin_cms/admin_cms.go +++ b/internal/rpc/admin_cms/admin_cms.go @@ -46,8 +46,7 @@ func (s *adminCMSServer) Run() { //listener network listener, err := net.Listen("tcp", address) if err != nil { - log.NewError("0", "Listen failed ", err.Error(), address) - return + panic("listening err:" + err.Error() + s.rpcRegisterName) } log.NewInfo("0", "listen network success, ", address, listener) defer listener.Close() diff --git a/internal/rpc/auth/auth.go b/internal/rpc/auth/auth.go index 1de8f16c7..09b903c68 100644 --- a/internal/rpc/auth/auth.go +++ b/internal/rpc/auth/auth.go @@ -88,8 +88,7 @@ func (rpc *rpcAuth) Run() { address := listenIP + ":" + strconv.Itoa(rpc.rpcPort) listener, err := net.Listen("tcp", address) if err != nil { - log.NewError(operationID, "listen network failed ", err.Error(), address) - return + panic("listening err:" + err.Error() + rpc.rpcRegisterName) } log.NewInfo(operationID, "listen network success, ", address, listener) //grpc server diff --git a/internal/rpc/cache/cache.go b/internal/rpc/cache/cache.go index 2cf6f33d0..07a94d0e6 100644 --- a/internal/rpc/cache/cache.go +++ b/internal/rpc/cache/cache.go @@ -47,8 +47,7 @@ func (s *cacheServer) Run() { //listener network listener, err := net.Listen("tcp", address) if err != nil { - log.NewError("0", "Listen failed ", err.Error(), address) - return + panic("listening err:" + err.Error() + s.rpcRegisterName) } log.NewInfo("0", "listen network success, ", address, listener) defer listener.Close() diff --git a/internal/rpc/conversation/conversaion.go b/internal/rpc/conversation/conversaion.go index eb08f74a4..84e0b302a 100644 --- a/internal/rpc/conversation/conversaion.go +++ b/internal/rpc/conversation/conversaion.go @@ -148,8 +148,7 @@ func (rpc *rpcConversation) Run() { listener, err := net.Listen("tcp", address) if err != nil { - log.NewError("0", "listen network failed ", err.Error(), address) - return + panic("listening err:" + err.Error() + rpc.rpcRegisterName) } log.NewInfo("0", "listen network success, ", address, listener) //grpc server diff --git a/internal/rpc/friend/firend.go b/internal/rpc/friend/firend.go index 5941739c5..d85ccbc55 100644 --- a/internal/rpc/friend/firend.go +++ b/internal/rpc/friend/firend.go @@ -53,8 +53,7 @@ func (s *friendServer) Run() { //listener network listener, err := net.Listen("tcp", address) if err != nil { - log.NewError("0", "Listen failed ", err.Error(), address) - return + panic("listening err:" + err.Error() + s.rpcRegisterName) } log.NewInfo("0", "listen ok ", address) defer listener.Close() diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index c9f63cac3..c8b70aa63 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -54,8 +54,7 @@ func (s *groupServer) Run() { //listener network listener, err := net.Listen("tcp", address) if err != nil { - log.NewError("", "Listen failed ", err.Error(), address) - return + panic("listening err:" + err.Error() + s.rpcRegisterName) } log.NewInfo("", "listen network success, ", address, listener) defer listener.Close() diff --git a/internal/rpc/message_cms/message_cms.go b/internal/rpc/message_cms/message_cms.go index 40609de7c..cb2ce3a09 100644 --- a/internal/rpc/message_cms/message_cms.go +++ b/internal/rpc/message_cms/message_cms.go @@ -54,8 +54,7 @@ func (s *messageCMSServer) Run() { //listener network listener, err := net.Listen("tcp", address) if err != nil { - log.NewError("0", "Listen failed ", err.Error(), address) - return + panic("listening err:" + err.Error() + s.rpcRegisterName) } log.NewInfo("0", "listen network success, ", address, listener) defer listener.Close() diff --git a/internal/rpc/msg/pull_message.go b/internal/rpc/msg/pull_message.go index 10a0978aa..a91c07a04 100644 --- a/internal/rpc/msg/pull_message.go +++ b/internal/rpc/msg/pull_message.go @@ -11,7 +11,7 @@ import ( ) func (rpc *rpcChat) GetMaxAndMinSeq(_ context.Context, in *pbMsg.GetMaxAndMinSeqReq) (*pbMsg.GetMaxAndMinSeqResp, error) { - log.InfoByKv("rpc getMaxAndMinSeq is arriving", in.OperationID, in.String()) + log.NewInfo(in.OperationID, "rpc getMaxAndMinSeq is arriving", in.String()) //seq, err := model.GetBiggestSeqFromReceive(in.UserID) maxSeq, err1 := commonDB.DB.GetUserMaxSeq(in.UserID) minSeq, err2 := commonDB.DB.GetUserMinSeq(in.UserID) diff --git a/internal/rpc/msg/rpcChat.go b/internal/rpc/msg/rpcChat.go index e49d90a6d..8bed05810 100644 --- a/internal/rpc/msg/rpcChat.go +++ b/internal/rpc/msg/rpcChat.go @@ -45,8 +45,7 @@ func (rpc *rpcChat) Run() { address := listenIP + ":" + strconv.Itoa(rpc.rpcPort) listener, err := net.Listen("tcp", address) if err != nil { - log.Error("", "listen network failed ", err.Error(), address) - return + panic("listening err:" + err.Error() + rpc.rpcRegisterName) } log.Info("", "listen network success, address ", address) diff --git a/internal/rpc/office/office.go b/internal/rpc/office/office.go index 46e8a0cba..bc680f4bb 100644 --- a/internal/rpc/office/office.go +++ b/internal/rpc/office/office.go @@ -49,8 +49,7 @@ func (s *officeServer) Run() { //listener network listener, err := net.Listen("tcp", address) if err != nil { - log.NewError("0", "Listen failed ", err.Error(), address) - return + panic("listening err:" + err.Error() + s.rpcRegisterName) } log.NewInfo("0", "listen network success, ", address, listener) defer listener.Close() diff --git a/internal/rpc/organization/organization.go b/internal/rpc/organization/organization.go index 8dd512dcf..557539766 100644 --- a/internal/rpc/organization/organization.go +++ b/internal/rpc/organization/organization.go @@ -50,8 +50,7 @@ func (s *organizationServer) Run() { //listener network listener, err := net.Listen("tcp", address) if err != nil { - log.NewError("", "Listen failed ", err.Error(), address) - return + panic("listening err:" + err.Error() + s.rpcRegisterName) } log.NewInfo("", "listen network success, ", address, listener) defer listener.Close() diff --git a/internal/rpc/statistics/statistics.go b/internal/rpc/statistics/statistics.go index d7100c50d..e4daf0309 100644 --- a/internal/rpc/statistics/statistics.go +++ b/internal/rpc/statistics/statistics.go @@ -58,8 +58,7 @@ func (s *statisticsServer) Run() { //listener network listener, err := net.Listen("tcp", address) if err != nil { - log.NewError("0", "Listen failed ", err.Error(), address) - return + panic("listening err:" + err.Error() + s.rpcRegisterName) } log.NewInfo("0", "listen network success, ", address, listener) defer listener.Close() diff --git a/internal/rpc/user/user.go b/internal/rpc/user/user.go index abb3b0a34..a888807b9 100644 --- a/internal/rpc/user/user.go +++ b/internal/rpc/user/user.go @@ -55,8 +55,7 @@ func (s *userServer) Run() { //listener network listener, err := net.Listen("tcp", address) if err != nil { - log.NewError("0", "listen network failed ", err.Error(), address) - return + panic("listening err:" + err.Error() + s.rpcRegisterName) } log.NewInfo("0", "listen network success, address ", address, listener) defer listener.Close()