From d7ee5b3444e7681cfb4574681d54156e148c34da Mon Sep 17 00:00:00 2001
From: 龙赣华 <slongertian@gmail.com>
Date: 星期三, 05 六月 2019 11:47:24 +0800
Subject: [PATCH] by 192.168.1.124
---
sdk/sdk.go | 156 ++++++++++++++++++++++++++++++---------------------
1 files changed, 92 insertions(+), 64 deletions(-)
diff --git a/sdk/sdk.go b/sdk/sdk.go
index 0eddfb3..3e5baef 100644
--- a/sdk/sdk.go
+++ b/sdk/sdk.go
@@ -21,6 +21,7 @@
)
var SocketManage = make(map[string]SocketContext)
+var SdkMap = make(map[string]chan *protomsg.SdkMessage)
type SocketContext struct {
Sock deliver.Deliver
@@ -31,25 +32,48 @@
func Init() {
fmt.Println("============= init sdk info =====================")
- SdkCreateTopic(util.Sdklist) // 鍒涘缓涓婚
-
for _, sdkid := range util.Sdklist { // 鍒涘缓sdk server
- url := fmt.Sprintf("ipc:///tmp/%s%s", sdkid, postPull)
- sdkidser, socketser, err := NewSdkSocketListen(deliver.PushPull, sdkid, url)
- if err != nil {
- continue
- }
- go Send(sdkidser, socketser, SdkMap[sdkid])
-
- url = fmt.Sprintf("ipc:///tmp/%s%s", sdkid, postPush)
- _, socketdial, err := NewSdkSocketListen(deliver.PushPull, sdkid, url)
- if err != nil {
- continue
- }
- go Recv(socketdial)
-
+ CreatesdkTopicandServer(sdkid)
+ fmt.Println()
}
+
+ SdkMap["es"] = make(chan *protomsg.SdkMessage)
+ fmt.Println("create es channel: ")
go es(SdkMap["es"])
+ go AutoDelSdk(util.Sdkflag)
+}
+
+func CreatesdkTopicandServer(sdkid string) {
+ SdkMap[sdkid] = make(chan *protomsg.SdkMessage)
+ fmt.Println("create sdk channel: ", sdkid)
+
+ url := fmt.Sprintf("ipc:///tmp/%s%s", sdkid, postPull)
+ sdkidser, socketser, err := NewSdkSocketListen(deliver.PushPull, sdkid, url)
+ if err != nil {
+ delete(SdkMap, sdkid)
+ fmt.Println(sdkid, "create server error!")
+ return
+ }
+ go Send(sdkidser, socketser, SdkMap[sdkid])
+
+ url = fmt.Sprintf("ipc:///tmp/%s%s", sdkid, postPush)
+ _, socketdial, err := NewSdkSocketListen(deliver.PushPull, sdkid, url)
+ if err != nil {
+ delete(SdkMap, sdkid)
+ fmt.Println(sdkid, "create dial error!")
+ return
+ }
+ go Recv(socketdial)
+
+}
+func DeletesdkTopicandServer(sdkid string) {
+ close(SdkMap[sdkid])
+ delete(SdkMap, sdkid)
+ fmt.Println("鍒犻櫎涓婚 sdk: ", sdkid)
+
+ SocketManage[sdkid].Cancel()
+ delete(SocketManage, sdkid)
+ fmt.Println("鍒犻櫎server sdk: ", sdkid)
}
//鍗曠嫭澶勭悊 es 涓婚鐨勬儏鍐�
@@ -60,38 +84,50 @@
}
//鍔ㄦ�佸鐞�
-func AutoDelSdk(Newsdklist []string) {
- var oldSdk []string
- for key, _ := range SdkMap {
- oldSdk = append(oldSdk, key)
- }
- sdkChanDel := util.Difference(oldSdk, Newsdklist)
+func AutoDelSdk(sdkflag chan bool) {
- for key, op := range sdkChanDel {
- if op == "add" {
- SdkMap[key] = make(chan *protomsg.SdkMessage)
- fmt.Println("鍒涘缓涓婚 sdk: ", key)
- } else {
- close(SdkMap[key])
- delete(SdkMap, key)
- fmt.Println("鍒犻櫎涓婚 sdk: ", key)
+ for _ = range sdkflag {
+ fmt.Println("test autodelsdk")
+ var oldSdk []string
+ for key, _ := range SdkMap {
+ oldSdk = append(oldSdk, key)
+ }
+ util.Sdklist = append(util.Sdklist, "es")
+ sdkChanDel := util.Difference(oldSdk, util.Sdklist)
+ fmt.Println(sdkChanDel)
+
+ for key, op := range sdkChanDel {
+ if op == "add" {
+ CreatesdkTopicandServer(key)
+ } else {
+ DeletesdkTopicandServer(key)
+ fmt.Println("鍒犻櫎涓婚 sdk: ", key)
+ }
}
}
}
//涓婚
-var SdkMap = make(map[string]chan *protomsg.SdkMessage)
//sdk鏁版嵁 鍔犲伐鍣�
func SdkData(cid string, taskid string, data []byte) *protomsg.SdkMessage {
var sdkmsg = &protomsg.SdkMessage{}
sdkmsg.Cid = cid
- if _, ok := tasktag.TaskMapLab[taskid]; !ok {
+ //if _, ok := tasktag.TaskMapLab[taskid]; !ok {
+ // sdkmsg.Tasklab = nil
+ // return sdkmsg
+ //}
+
+ if val, ok := tasktag.TaskMapLab.Load(taskid); ok {
sdkmsg.Tasklab = nil
return sdkmsg
+
+ } else {
+
+ sdkmsg.Tasklab = val.(*protomsg.TaskLabel)
+ sdkmsg.Data = data
}
- sdkmsg.Tasklab = tasktag.TaskMapLab[taskid]
- sdkmsg.Data = data
+ //sdkmsg.Tasklab = tasktag.TaskMapLab[taskid]
return sdkmsg
}
@@ -106,19 +142,6 @@
return
}
-// 鍒涘缓涓婚
-func SdkCreateTopic(sdklist []string) (err error) {
- for _, sdkid := range sdklist {
- SdkMap[sdkid] = make(chan *protomsg.SdkMessage)
- fmt.Println("create sdk channel: ", sdkid)
- }
-
- SdkMap["es"] = make(chan *protomsg.SdkMessage)
- fmt.Println("create es channel: ")
-
- return nil
-}
-
// create server
func NewSdkSocketListen(mode int, sdkid string, url string) (sid string, socket SocketContext, err error) {
fmt.Println("url is: ", url)
@@ -128,7 +151,6 @@
socket.Cancel = cancel
socket.Sock = deliver.NewServer(deliver.Mode(mode), url)
- fmt.Println(sdkid, socket.Sock)
if socket.Sock == nil {
return sdkid, socket, errors.New("create listen error")
@@ -146,7 +168,6 @@
socket.Cancel = cancel
socket.Sock = deliver.NewClient(deliver.Mode(mode), url)
- fmt.Println(sdkid, socket.Sock)
if socket.Sock == nil {
return sdkid, socket, errors.New("create listen error")
@@ -157,7 +178,6 @@
}
func Recv(socket SocketContext) {
- //socket.Sock.SetOption(mangos.OptionRecvDeadline, 1*time.Second)
var repsdkmsg = &protomsg.SdkMessage{}
for {
@@ -186,27 +206,35 @@
func Send(sdkid string, socket SocketContext, in chan *protomsg.SdkMessage) {
var v *protomsg.SdkMessage
+ var ok bool
for {
select {
case <-socket.Context.Done():
fmt.Println("socket is close")
- case v = <-in:
- data, err := proto.Marshal(v)
- if err != nil {
- fmt.Println("proto marshal error ", err)
- continue
- }
- fmt.Printf("浠庣閬搒dkid=%s 鎺ュ彈鏁版嵁 %d\n", sdkid, len(data))
- fmt.Println()
+ return
+ case v, ok = <-in:
+ if ok {
+ data, err := proto.Marshal(v)
+ if err != nil {
+ fmt.Println("proto marshal error ", err)
+ continue
+ }
+ fmt.Printf("浠庣閬搒dkid=%s 鎺ュ彈鏁版嵁 %d\n", sdkid, len(data))
+ fmt.Println()
- fmt.Println("send len of data: ", len(data))
- if err := socket.Sock.Send(data); err != nil {
- fmt.Println(socket.Sock)
- fmt.Println("failed send")
- continue
+ fmt.Println("send len of data: ", len(data))
+ if err := socket.Sock.Send(data); err != nil {
+ fmt.Println(socket.Sock)
+ fmt.Println("failed send")
+ continue
+ }
+ fmt.Printf("sdkid = %s ,send success:%d \n", sdkid, len(data))
+ } else {
+ fmt.Println(sdkid, " 涓婚鍏抽棴, 鍏抽棴send()")
+ return
}
- fmt.Printf("sdkid = %s ,send success:%d \n", sdkid, len(data))
+
}
}
}
--
Gitblit v1.8.0