From bf35e6daea1d32914bf2114afdbc2e17de8f850e Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期四, 14 一月 2021 18:00:52 +0800
Subject: [PATCH] Request 添加日志
---
micronode.go | 4 ----
hbusc.go | 15 +++++++++------
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/hbusc.go b/hbusc.go
index 180a929..edeacd4 100644
--- a/hbusc.go
+++ b/hbusc.go
@@ -412,7 +412,7 @@
func (h *BHBus) Request(serverId string, req *MsgInfo, milliSecs int) (resp *MsgInfo, err error) {
//1.棣栧厛闇�瑕侀�氳繃topic鎷垮埌鏈満瀵瑰簲鐨凬etNode
rNodes, err := h.GetNetNodeByTopic(serverId, &req.SrcProc, req.Topic)
- h.printLog("rNodes:", rNodes, "err:", err)
+ h.printLog("topic", req.Topic, "rNodes:", rNodes, "err:", err)
if err != nil {
return nil, err
}
@@ -424,11 +424,14 @@
}
var ret []bhomebus.Mesg
- if n := h.sockWorker.sock.SendandrecvTimeout(rNodes, data,&ret, milliSecs);n > 0 {
- if len(ret) > 0 {
- if err = json.Unmarshal(ret[0].Data, resp); err == nil {
- return resp, nil
- }
+ n := h.sockWorker.sock.SendandrecvTimeout(rNodes, data,&ret, milliSecs)
+ h.printLog("Request n: ", n, " len(ret): ", len(ret))
+ if n > 0 && len(ret) > 0 {
+ if err = json.Unmarshal(ret[0].Data, resp); err == nil {
+ return resp, nil
+ } else {
+ h.printLog("unmarshal ret[0].Data err:", err)
+ return nil, err
}
}
return nil, fmt.Errorf("request err")
diff --git a/micronode.go b/micronode.go
index 5e105d2..1055724 100644
--- a/micronode.go
+++ b/micronode.go
@@ -112,11 +112,7 @@
func (ms *MicroNode) Request(serverId string, request Request) (*Reply,error) {
t := time.Now()
- topicName := request.Header("Servicename")
- if topicName == "" {
- return nil,errors.New("Servicename 涓嶈兘涓虹┖")
- }
ms.printLog("1:", time.Since(t))
t = time.Now()
rb, _ := json.Marshal(request)
--
Gitblit v1.8.0