From f3d97adc87f0682b9f53599815d7db67e7db754d Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期二, 26 一月 2021 11:23:13 +0800
Subject: [PATCH] regSock sendandrecv添加超时
---
micronode.go | 113 ++++++++++++++++++++++----------------------------------
1 files changed, 45 insertions(+), 68 deletions(-)
diff --git a/micronode.go b/micronode.go
index 5e105d2..04ad27f 100644
--- a/micronode.go
+++ b/micronode.go
@@ -23,7 +23,7 @@
}
func NewMicroNode(ctx context.Context,q chan os.Signal, serverId string, reg *RegisterInfo, fnLog func(v ...interface{})) (*MicroNode, error){
- conf := NewConfig(KEY_REGISTER,512,5,100,100,100, fnLog)
+ conf := NewConfig(KEY_REGISTER,512,5,1000,100,1000, fnLog)
handle, err := Register(ctx, q, conf, reg)
if err != nil {
return nil, err
@@ -69,7 +69,7 @@
Proc: *ms.procInfo,
}
- t := time.NewTicker(time.Second)
+ t := time.NewTicker(1 * time.Second)
defer t.Stop()
for {
@@ -110,13 +110,9 @@
}
}
-func (ms *MicroNode) Request(serverId string, request Request) (*Reply,error) {
+func (ms *MicroNode) Request(serverId string, request Request, milliSecs int) (*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)
@@ -125,48 +121,21 @@
Body: rb,
}
ms.printLog("2:", time.Since(t))
- t = time.Now()
- mi,err := ms.handle.Request(serverId, msgR, 5000)
- if mi == nil || err != nil {
- return nil, err
- }
- ms.printLog("3:", time.Since(t))
- t = time.Now()
- ri := new(Reply)
- err = json.Unmarshal(mi.Body, ri)
- if err != nil {
- ms.printLog("unmarshal mi.Body err:", err)
- ri = &Reply{
- Success: false,
- Msg: "鏈嶅姟璇锋眰澶辫触",
- Data: "鏈嶅姟璇锋眰澶辫触",
- }
- }
- ms.printLog("4:", time.Since(t))
- return ri, nil
+ return ms.handle.Request(serverId, msgR, milliSecs)
}
-func (ms *MicroNode) RequestTopic(serverId string, request Request) (*Reply,error) {
+func (ms *MicroNode) RequestTopic(serverId string, request Request, milliSecs int) (*Reply,error) {
rb, _ := json.Marshal(request)
msgR := &MsgInfo{
Topic: request.Path,
Body: rb,
}
- mi, err := ms.handle.Request(serverId, msgR, 5000)
- if err != nil {
- return nil, err
- }
- var ri *Reply
- err = json.Unmarshal(mi.Body, ri)
- if err != nil {
- ri = &Reply{
- Success: false,
- Msg: "鏈嶅姟璇锋眰澶辫触",
- Data: "鏈嶅姟璇锋眰澶辫触",
- }
- }
- return ri, nil
+ return ms.handle.Request(serverId, msgR, milliSecs)
+}
+
+func (ms *MicroNode) RequestOnly(rData []byte, nodes []bhomebus.NetNode) ([]byte, error) {
+ return ms.handle.RequestOnly(rData, nodes)
}
//鑾峰彇鏈満涓煇涓�涓富棰樼殑 key 锛堢粨鏋滃彧鏈変竴涓厓绱狅級
@@ -199,16 +168,21 @@
ms.printLog("requestCenter reply:", cr, "err:", err)
return nil, err
}
- if cr.Status == REPLY_SUCCESS && cr.Body != nil {
- var list []RegisteredClient
- err = json.Unmarshal(cr.Body, &list)
+ if cr.Success {
+ rd,err := json.Marshal(cr.Data)
if err == nil {
- return list, nil
+ var list []RegisteredClient
+ err = json.Unmarshal(rd, &list)
+ if err == nil {
+ return list, nil
+ } else {
+ ms.printLog("unmarshal to RegisteredClient list err:", err)
+ }
} else {
- ms.printLog("unmarshal to RegisteredClient list err:", err)
+ return nil, fmt.Errorf("marshal reply.Data err:%s", err.Error())
}
} else {
- ms.printLog("request center failed,status:", cr.Status, "desc:", cr.Desc)
+ ms.printLog("request center failed,status:", cr.Success, "msg:", cr.Msg, " data:", cr.Data)
}
return nil, fmt.Errorf("GetRegisteredClient list failed")
}
@@ -219,38 +193,41 @@
}
var reqBody Request
+ var ri *Reply
err := json.Unmarshal(msgR.Body, &reqBody)
if err != nil {
ms.printLog("serve unmarshal msgR.Body err:", err)
- return
- }
-
- ms.printLog("reqBody:", reqBody)
- var ri *Reply
- if f,ok := ms.handlers[reqBody.Path];ok {
- ri = f(&reqBody)
- ms.printLog("call funcMap f,reply:", *ri)
+ ri = &Reply {
+ Msg: err.Error(),
+ }
} else {
- ms.printLog("ms.funcMap not eixst path")
- ri = &Reply{
- Success: false,
- Msg: "璇锋眰鐨勬帴鍙ｄ笉瀛樺湪锛岃妫�鏌rl",
- Data: "璇锋眰鐨勬帴鍙ｄ笉瀛樺湪锛岃妫�鏌rl",
+ ms.printLog("reqBody:", reqBody, "to key: ", p)
+
+ if f,ok := ms.handlers[reqBody.Path];ok {
+ reqBody.SrcProc = msgR.SrcProc
+ ri = f(&reqBody)
+ ms.printLog("call funcMap f,reply:", *ri)
+ } else {
+ ms.printLog("ms.funcMap not eixst path")
+ ri = &Reply{
+ Success: false,
+ Msg: "璇锋眰鐨勬帴鍙ｄ笉瀛樺湪锛岃妫�鏌rl",
+ Data: "璇锋眰鐨勬帴鍙ｄ笉瀛樺湪锛岃妫�鏌rl",
+ }
}
}
- rd,err := json.Marshal(*ri)
- if err != nil {
- ms.printLog("marshal *ri err:", err)
+
+ retErr := ms.handle.Reply(p, ri)
+ if retErr != nil {
+ ms.printLog("retErr:", retErr)
}
- rMsg := MsgInfo{
- Body: rd,
- }
- ms.handle.Reply(p, rMsg)
}
//鍙戝竷鍒版湰鏈�
func (ms *MicroNode) Publish(topic string,msg []byte) error {
- nodes := append([]bhomebus.NetNode{}, bhomebus.NetNode{})
+ nodes := append([]bhomebus.NetNode{}, bhomebus.NetNode{
+ Key: 8,
+ })
return ms.PublishNet(nodes, topic, msg)
}
--
Gitblit v1.8.0