From 2b479319c131ea5a463b6c01452d93c68aaa557c Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Tue, 10 May 2022 10:52:32 +0800 Subject: [PATCH] log change --- internal/api/chat/send_msg.go | 1 - internal/api/manage/management_chat.go | 8 ++++---- internal/demo/register/send_code.go | 6 +++--- internal/msg_gateway/gate/logic.go | 3 --- internal/msg_gateway/gate/validate.go | 12 ++++++------ internal/msg_gateway/gate/ws_server.go | 6 +++--- internal/push/logic/push_handler.go | 2 +- internal/rpc/msg/pull_message.go | 2 +- internal/rpc/msg/send_msg.go | 2 +- pkg/statistics/statistics.go | 8 +++++++- 10 files changed, 26 insertions(+), 24 deletions(-) diff --git a/internal/api/chat/send_msg.go b/internal/api/chat/send_msg.go index 36ebd4181..b75cd0ddd 100644 --- a/internal/api/chat/send_msg.go +++ b/internal/api/chat/send_msg.go @@ -62,7 +62,6 @@ func SendMsg(c *gin.Context) { params := paramsUserSendMsg{} 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 } diff --git a/internal/api/manage/management_chat.go b/internal/api/manage/management_chat.go index d39aa6d16..2178fc840 100644 --- a/internal/api/manage/management_chat.go +++ b/internal/api/manage/management_chat.go @@ -94,7 +94,7 @@ func ManagementSendMsg(c *gin.Context) { params := ManagementSendMsgReq{} if err := c.BindJSON(¶ms); err != nil { c.JSON(http.StatusBadRequest, gin.H{"errCode": 400, "errMsg": err.Error()}) - log.ErrorByKv("json unmarshal err", c.PostForm("operationID"), "err", err.Error(), "content", c.PostForm("content")) + log.Error(c.PostForm("operationID"), "json unmarshal err", err.Error(), c.PostForm("content")) return } switch params.ContentType { @@ -126,16 +126,16 @@ func ManagementSendMsg(c *gin.Context) { //case constant.Quote: default: c.JSON(http.StatusBadRequest, gin.H{"errCode": 404, "errMsg": "contentType err"}) - log.ErrorByKv("contentType err", c.PostForm("operationID"), "content", c.PostForm("content")) + log.Error(c.PostForm("operationID"), "contentType err", c.PostForm("content")) return } if err := mapstructure.WeakDecode(params.Content, &data); err != nil { c.JSON(http.StatusBadRequest, gin.H{"errCode": 401, "errMsg": err.Error()}) - log.ErrorByKv("content to Data struct err", "", "err", err.Error()) + log.Error(c.PostForm("operationID"), "content to Data struct err", err.Error()) return } else if err := validate.Struct(data); err != nil { c.JSON(http.StatusBadRequest, gin.H{"errCode": 403, "errMsg": err.Error()}) - log.ErrorByKv("data args validate err", "", "err", err.Error()) + log.Error(c.PostForm("operationID"), "data args validate err", err.Error()) return } log.NewInfo("", data, params) diff --git a/internal/demo/register/send_code.go b/internal/demo/register/send_code.go index 37e355b46..089a55800 100644 --- a/internal/demo/register/send_code.go +++ b/internal/demo/register/send_code.go @@ -21,7 +21,7 @@ type paramsVerificationCode struct { Email string `json:"email"` PhoneNumber string `json:"phoneNumber"` OperationID string `json:"operationID" binding:"required"` - UsedFor int `json:"usedFor"` + UsedFor int `json:"usedFor"` } func SendVerificationCode(c *gin.Context) { @@ -62,7 +62,7 @@ func SendVerificationCode(c *gin.Context) { } rand.Seed(time.Now().UnixNano()) code := 100000 + rand.Intn(900000) - log.NewInfo(params.OperationID, params.UsedFor,"begin store redis", accountKey, code) + log.NewInfo(params.OperationID, params.UsedFor, "begin store redis", accountKey, code) err := db.DB.SetAccountCode(accountKey, code, config.Config.Demo.CodeTTL) if err != nil { log.NewError(params.OperationID, "set redis error", accountKey, "err", err.Error()) @@ -77,7 +77,7 @@ func SendVerificationCode(c *gin.Context) { m.SetHeader(`Subject`, config.Config.Demo.Mail.Title) m.SetBody(`text/html`, fmt.Sprintf("%d", code)) if err := gomail.NewDialer(config.Config.Demo.Mail.SmtpAddr, config.Config.Demo.Mail.SmtpPort, config.Config.Demo.Mail.SenderMail, config.Config.Demo.Mail.SenderAuthorizationCode).DialAndSend(m); err != nil { - log.ErrorByKv("send mail error", account, "err", err.Error()) + log.Error(params.OperationID, "send mail error", account, err.Error()) c.JSON(http.StatusOK, gin.H{"errCode": constant.MailSendCodeErr, "errMsg": ""}) return } diff --git a/internal/msg_gateway/gate/logic.go b/internal/msg_gateway/gate/logic.go index e5f49dbc6..3d65af106 100644 --- a/internal/msg_gateway/gate/logic.go +++ b/internal/msg_gateway/gate/logic.go @@ -69,9 +69,6 @@ func (ws *WServer) getSeqReq(conn *UserConn, m *Req) { rpcReq.UserID = m.SendID rpcReq.OperationID = m.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", rpcReq.OperationID, "args", m) - } msgClient := pbChat.NewChatClient(grpcConn) rpcReply, err := msgClient.GetMaxAndMinSeq(context.Background(), &rpcReq) if err != nil { diff --git a/internal/msg_gateway/gate/validate.go b/internal/msg_gateway/gate/validate.go index 35bc34f0e..31198a918 100644 --- a/internal/msg_gateway/gate/validate.go +++ b/internal/msg_gateway/gate/validate.go @@ -62,11 +62,11 @@ func (ws *WServer) argsValidate(m *Req, r int32) (isPass bool, errCode int32, er case constant.WSSendMsg: data := open_im_sdk.MsgData{} if err := proto.Unmarshal(m.Data, &data); err != nil { - log.ErrorByKv("Decode Data struct err", "", "err", err.Error(), "reqIdentifier", r) + log.Error("", "Decode Data struct err", err.Error(), r) return false, 203, err.Error(), nil } if err := validate.Struct(data); err != nil { - log.ErrorByKv("data args validate err", "", "err", err.Error(), "reqIdentifier", r) + log.Error("", "data args validate err", err.Error(), r) return false, 204, err.Error(), nil } @@ -74,11 +74,11 @@ func (ws *WServer) argsValidate(m *Req, r int32) (isPass bool, errCode int32, er case constant.WSSendSignalMsg: data := pbRtc.SignalReq{} if err := proto.Unmarshal(m.Data, &data); err != nil { - log.ErrorByKv("Decode Data struct err", "", "err", err.Error(), "reqIdentifier", r) + log.Error("", "Decode Data struct err", err.Error(), r) return false, 203, err.Error(), nil } if err := validate.Struct(data); err != nil { - log.ErrorByKv("data args validate err", "", "err", err.Error(), "reqIdentifier", r) + log.Error("", "data args validate err", err.Error(), r) return false, 204, err.Error(), nil } @@ -86,11 +86,11 @@ func (ws *WServer) argsValidate(m *Req, r int32) (isPass bool, errCode int32, er case constant.WSPullMsgBySeqList: data := open_im_sdk.PullMessageBySeqListReq{} if err := proto.Unmarshal(m.Data, &data); err != nil { - log.ErrorByKv("Decode Data struct err", "", "err", err.Error(), "reqIdentifier", r) + log.Error("", "Decode Data struct err", err.Error(), r) return false, 203, err.Error(), nil } if err := validate.Struct(data); err != nil { - log.ErrorByKv("data args validate err", "", "err", err.Error(), "reqIdentifier", r) + log.Error("", "data args validate err", err.Error(), r) return false, 204, err.Error(), nil } diff --git a/internal/msg_gateway/gate/ws_server.go b/internal/msg_gateway/gate/ws_server.go index 4ce4e8648..c14277c9c 100644 --- a/internal/msg_gateway/gate/ws_server.go +++ b/internal/msg_gateway/gate/ws_server.go @@ -45,7 +45,7 @@ func (ws *WServer) run() { http.HandleFunc("/", ws.wsHandler) //Get request from client to handle by wsHandler err := http.ListenAndServe(ws.wsAddr, nil) //Start listening if err != nil { - log.ErrorByKv("Ws listening err", "", "err", err.Error()) + panic("Ws listening err:" + err.Error()) } } @@ -54,7 +54,7 @@ func (ws *WServer) wsHandler(w http.ResponseWriter, r *http.Request) { query := r.URL.Query() conn, err := ws.wsUpGrader.Upgrade(w, r, nil) //Conn is obtained through the upgraded escalator if err != nil { - log.ErrorByKv("upgrade http conn err", "", "err", err, query) + log.Error("", "upgrade http conn err", err, query) return } else { //Connection mapping relationship, @@ -77,7 +77,7 @@ func (ws *WServer) readMsg(conn *UserConn) { } if err != nil { uid, platform := ws.getUserUid(conn) - log.ErrorByKv("WS ReadMsg error", "", "userIP", conn.RemoteAddr().String(), "userUid", uid, "platform", platform, "error", err.Error()) + log.Error("", "WS ReadMsg error", "userIP", conn.RemoteAddr().String(), "userUid", uid, "platform", platform, "error", err.Error()) userCount-- ws.delUserConn(conn) return diff --git a/internal/push/logic/push_handler.go b/internal/push/logic/push_handler.go index 192a9c400..5412b8b3e 100644 --- a/internal/push/logic/push_handler.go +++ b/internal/push/logic/push_handler.go @@ -34,7 +34,7 @@ func (ms *PushConsumerHandler) handleMs2PsChat(msg []byte) { 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()) + log.Error("", "push Unmarshal msg err", "msg", string(msg), "err", err.Error()) return } //Call push module to send message to the user diff --git a/internal/rpc/msg/pull_message.go b/internal/rpc/msg/pull_message.go index a91c07a04..819a9592e 100644 --- a/internal/rpc/msg/pull_message.go +++ b/internal/rpc/msg/pull_message.go @@ -42,7 +42,7 @@ func (rpc *rpcChat) PullMessageBySeqList(_ context.Context, in *open_im_sdk.Pull //msgList, err := commonDB.DB.GetMsgBySeqList(in.UserID, in.SeqList, in.OperationID) msgList, err := commonDB.DB.GetMsgBySeqListMongo2(in.UserID, in.SeqList, in.OperationID) if err != nil { - log.ErrorByKv("PullMessageBySeqList data error", in.OperationID, in.String()) + log.Error(in.OperationID, "PullMessageBySeqList data error", in.String(), err.Error()) resp.ErrCode = 201 resp.ErrMsg = err.Error() return resp, nil diff --git a/internal/rpc/msg/send_msg.go b/internal/rpc/msg/send_msg.go index b8af3b145..78588cdf1 100644 --- a/internal/rpc/msg/send_msg.go +++ b/internal/rpc/msg/send_msg.go @@ -419,7 +419,7 @@ func (rpc *rpcChat) SendMsg(_ context.Context, pb *pbChat.SendMsgReq) (*pbChat.S func (rpc *rpcChat) sendMsgToKafka(m *pbChat.MsgDataToMQ, key string) error { pid, offset, err := rpc.producer.SendMessage(m, key) if err != nil { - log.ErrorByKv("kafka send failed", m.OperationID, "send data", m.String(), "pid", pid, "offset", offset, "err", err.Error(), "key", key) + log.Error(m.OperationID, "kafka send failed", "send data", m.String(), "pid", pid, "offset", offset, "err", err.Error(), "key", key) } return err } diff --git a/pkg/statistics/statistics.go b/pkg/statistics/statistics.go index 633eafc80..800f5864b 100644 --- a/pkg/statistics/statistics.go +++ b/pkg/statistics/statistics.go @@ -13,6 +13,7 @@ type Statistics struct { } func (s *Statistics) output() { + var intervalCount uint64 t := time.NewTicker(time.Duration(s.SleepTime) * time.Second) defer t.Stop() var sum uint64 @@ -21,7 +22,12 @@ func (s *Statistics) output() { select { case <-t.C: } - log.NewWarn("", " system stat ", s.ModuleName, s.PrintArgs, *s.AllCount-sum, "total:", *s.AllCount) + if *s.AllCount-sum <= 0 { + intervalCount = 0 + } else { + intervalCount = *s.AllCount - sum + } + log.NewWarn("", " system stat ", s.ModuleName, s.PrintArgs, intervalCount, "total:", *s.AllCount) } }