From 9843d5c7ba9e0a47cfcc78923a7e12039cba6abd Mon Sep 17 00:00:00 2001 From: Gordon <1432970085@qq.com> Date: Fri, 24 Mar 2023 19:21:08 +0800 Subject: [PATCH] ws update --- internal/msggateway/client.go | 11 ++++++++--- internal/msggateway/message_handler.go | 5 +++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/internal/msggateway/client.go b/internal/msggateway/client.go index 5ea9d48c6..57d260733 100644 --- a/internal/msggateway/client.go +++ b/internal/msggateway/client.go @@ -143,6 +143,7 @@ func (c *Client) handleMessage(message []byte) error { return utils.Wrap(errors.New("exception conn userID not same to req userID"), binaryReq.String()) } ctx := mcontext.WithMustInfoCtx([]string{binaryReq.OperationID, binaryReq.SendID, constant.PlatformIDToName(c.platformID), c.ctx.GetConnID()}) + log.ZDebug(ctx, "gateway req message", "req", binaryReq.String()) var messageErr error var resp []byte switch binaryReq.ReqIdentifier { @@ -161,7 +162,7 @@ func (c *Client) handleMessage(message []byte) error { default: return errors.New(fmt.Sprintf("ReqIdentifier failed,sendID:%d,msgIncr:%s,reqIdentifier:%s", binaryReq.SendID, binaryReq.MsgIncr, binaryReq.ReqIdentifier)) } - c.replyMessage(&binaryReq, messageErr, resp) + c.replyMessage(ctx, &binaryReq, messageErr, resp) return nil } @@ -183,7 +184,7 @@ func (c *Client) close() { c.longConnServer.UnRegister(c) } -func (c *Client) replyMessage(binaryReq *Req, err error, resp []byte) { +func (c *Client) replyMessage(ctx context.Context, binaryReq *Req, err error, resp []byte) { errResp := apiresp.ParseError(err) mReply := Resp{ ReqIdentifier: binaryReq.ReqIdentifier, @@ -193,7 +194,11 @@ func (c *Client) replyMessage(binaryReq *Req, err error, resp []byte) { ErrMsg: errResp.ErrMsg, Data: resp, } - _ = c.writeBinaryMsg(mReply) + log.ZDebug(ctx, "gateway reply message", "resp", mReply.String()) + err = c.writeBinaryMsg(mReply) + if err != nil { + log.ZWarn(ctx, "wireBinaryMsg replyMessage", err, "resp", mReply.String()) + } } func (c *Client) PushMessage(ctx context.Context, msgData *sdkws.MsgData) error { data, err := proto.Marshal(msgData) diff --git a/internal/msggateway/message_handler.go b/internal/msggateway/message_handler.go index b38108c1a..a8f331240 100644 --- a/internal/msggateway/message_handler.go +++ b/internal/msggateway/message_handler.go @@ -31,6 +31,11 @@ type Resp struct { ErrMsg string `json:"errMsg"` Data []byte `json:"data"` } + +func (r *Resp) String() string { + return utils.StructToJsonString(r) +} + type MessageHandler interface { GetSeq(context context.Context, data Req) ([]byte, error) SendMessage(context context.Context, data Req) ([]byte, error)