From 259cfd9c4802214f88d5b101ddf2a0d4b554b1de Mon Sep 17 00:00:00 2001
From: liuxiaolong <liuxiaolong@aiotlink.com>
Date: 星期一, 08 二月 2021 16:32:51 +0800
Subject: [PATCH] 减少日志输出
---
micronode.go | 95 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 91 insertions(+), 4 deletions(-)
diff --git a/micronode.go b/micronode.go
index 04ad27f..1f9fefc 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,1000,100,1000, fnLog)
+ conf := NewConfig(KEY_REGISTER,512,5,5000,5000,2000, fnLog)
handle, err := Register(ctx, q, conf, reg)
if err != nil {
return nil, err
@@ -106,9 +106,42 @@
//鏀跺埌鍏跺畠杩涚▼鐨勮姹傛秷鎭�
go ms.serve(msgR, keyR)
}
+
+ time.Sleep(50 * time.Millisecond)
}
}
+
+
+
+
+ //鎺ユ敹璁㈤槄鍒扮殑娑堟伅
+ //go ms.startRecvSubMsg()
+ //浣滀负server鍚姩
+ //ms.serve()
}
+
+//寮�濮嬫帴鏀惰闃呮秷鎭�
+//func (ms *MicroNode) startRecvSubMsg() {
+// for {
+// select {
+// case <- ms.ctx.Done():
+// return
+// default:
+// msgS, msgR, keyR := ms.handle.GetMsg()
+// if msgS != nil {
+// //鏀跺埌鍏跺畠杩涚▼鐨勫彂甯冩秷鎭�
+// ms.printLog("Recv Sub Message:", string(msgS.Body))
+// ms.SubCh <- msgS
+// }
+// if msgR != nil {
+// //鏀跺埌鍏跺畠杩涚▼鐨勮姹傛秷鎭�
+// go ms.serve(msgR, keyR)
+// }
+//
+// time.Sleep(50 * time.Millisecond)
+// }
+// }
+//}
func (ms *MicroNode) Request(serverId string, request Request, milliSecs int) (*Reply,error) {
t := time.Now()
@@ -187,6 +220,52 @@
return nil, fmt.Errorf("GetRegisteredClient list failed")
}
+//func (ms *MicroNode) call(rdata []byte, rkey int, sdata *[]byte) bool {
+// ri := &Reply{}
+// if ms.handlers == nil {
+// ri.Msg = "send wrong addr, check yourself!!!"
+// } else {
+// var msgR MsgInfo
+// err := json.Unmarshal(rdata, &msgR)
+// if err != nil {
+// ri.Msg = err.Error()
+// } else {
+// var reqBody Request
+// err = json.Unmarshal(rdata, &msgR.Body)
+// if err != nil {
+// ri.Msg = err.Error()
+// } else {
+// ms.printLog("srcProc:", reqBody.SrcProc,"reqBody Path:", reqBody.Path, " contentType:", reqBody.ContentType, " formMap:",reqBody.FormMap, " postFormMap:", reqBody.PostFormMap, "to key: ", rkey)
+// 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: ", reqBody.Path)
+// ri.Msg = "璇锋眰鐨勬帴鍙ｄ笉瀛樺湪锛岃妫�鏌rl"
+// }
+// }
+// }
+// }
+// result, err := json.Marshal(*ri)
+// if err != nil {
+// sdata = nil
+// } else {
+// sdata = &result
+// }
+// return ri.Success
+//}
+
+//func (ms *MicroNode) serve() {
+// if ms.handlers == nil {
+// return
+// }
+// for i:=0;i<10;i++ {
+// ms.handle.wg.Add(1)
+// go recvandsendRoutine(ms.ctx, ms.handle.sockRep.sock, ms.handle.wg, ms.call, ms.fnLog)
+// }
+//}
+
func (ms *MicroNode) serve(msgR *MsgInfo, p int) {
if ms.handlers == nil {
return
@@ -201,14 +280,14 @@
Msg: err.Error(),
}
} else {
- ms.printLog("reqBody:", reqBody, "to key: ", p)
+ ms.printLog("srcProc:", msgR.SrcProc,"reqBody Path:", reqBody.Path, " contentType:", reqBody.ContentType, " formMap:",reqBody.FormMap, " postFormMap:", reqBody.PostFormMap, "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)
+ ms.printLog("call funcMap f,reply.Success:", ri.Success)
} else {
- ms.printLog("ms.funcMap not eixst path")
+ ms.printLog("ms.funcMap not eixst path: ", reqBody.Path)
ri = &Reply{
Success: false,
Msg: "璇锋眰鐨勬帴鍙ｄ笉瀛樺湪锛岃妫�鏌rl",
@@ -239,6 +318,14 @@
return ms.handle.Pub(nodes, pi)
}
+func (ms *MicroNode) PublishNetTimeout(nodes []bhomebus.NetNode, topic string, msg []byte, timeout int) int {
+ pi := &MsgInfo{
+ Topic: topic,
+ Body: msg,
+ }
+ return ms.handle.PubTimeout(nodes, pi, timeout)
+}
+
//璁㈤槄涓婚
func (ms *MicroNode) Subscribe(topics []string) {
ms.handle.Sub(topics)
--
Gitblit v1.8.0