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 | 243 ++++++++++++++++++++++++++----------------------
1 files changed, 131 insertions(+), 112 deletions(-)
diff --git a/sdk/sdk.go b/sdk/sdk.go
index b97d132..3e5baef 100644
--- a/sdk/sdk.go
+++ b/sdk/sdk.go
@@ -2,96 +2,132 @@
import (
"context"
+ "errors"
"fmt"
- "time"
- "github.com/long/test/httpclient"
- "github.com/long/test/protomsg"
+ // "github.com/long/test/httpclient"
"github.com/long/test/tasktag"
"github.com/long/test/util"
- "nanomsg.org/go-mangos"
- "nanomsg.org/go-mangos/protocol/pair"
- "nanomsg.org/go-mangos/transport/ipc"
- "nanomsg.org/go-mangos/transport/tcp"
-
"github.com/golang/protobuf/proto"
+
+ "basic.com/pubsub/protomsg.git"
+ "basic.com/valib/deliver.git"
+)
+
+const (
+ postPull = "_1.ipc"
+ postPush = "_2.ipc"
)
var SocketManage = make(map[string]SocketContext)
+var SdkMap = make(map[string]chan *protomsg.SdkMessage)
type SocketContext struct {
- Sock mangos.Socket
+ Sock deliver.Deliver
Context context.Context
Cancel context.CancelFunc
}
func Init() {
- sdklist := SdkAll() //鑾峰彇鎵�鏈塻dk
- fmt.Println("sdk list have: ", sdklist)
-
- SdkCreateTopic(sdklist) // 鍒涘缓涓婚
-
- for _, sdkid := range sdklist { // 鍒涘缓sdk server
- sdkid, socket, err := NewSdkListen(sdkid, "tcp", "192.168.1.124", 0)
- if err != nil {
- continue
- }
- // 鎺ュ彈绠￠亾鏁版嵁 ==銆� 鍙戦�佺粰 瀵瑰簲鐨勮繘绋�
- go send(sdkid, socket, SdkMap[sdkid])
-
- //浠庡搴旇繘绋嬫帴鍙楁暟鎹� == 銆� 閲嶆柊閫佸洖鍒扮閬�
- go Recv(socket)
-
+ fmt.Println("============= init sdk info =====================")
+ for _, sdkid := range util.Sdklist { // 鍒涘缓sdk server
+ 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 涓婚鐨勬儏鍐�
func es(sdkmsgchan chan *protomsg.SdkMessage) {
- for data := range sdkmsgchan {
- fmt.Println("this data is finish all sdk! ", data)
+ for _ = range sdkmsgchan {
+ fmt.Println("this data is finish all sdk! ")
}
-
}
//鍔ㄦ�佸鐞�
-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
- }
- sdkmsg.Tasklab = tasktag.TaskMapLab[taskid]
- sdkmsg.Data = data
+ } else {
+
+ sdkmsg.Tasklab = val.(*protomsg.TaskLabel)
+ sdkmsg.Data = data
+ }
+ //sdkmsg.Tasklab = tasktag.TaskMapLab[taskid]
return sdkmsg
}
@@ -102,77 +138,46 @@
} else {
sdksend = "es"
}
- fmt.Println()
fmt.Println("鍒嗗彂鐨勪富棰樻槸锛� ", sdksend)
- fmt.Println()
return
}
-// 璋冪敤 http 鍊熷彛鑾峰彇鎽勫儚鏈轰俊鎭�
-func SdkAll() (sdklist []string) {
- sdklist = httpclient.GetSdk("http://127.0.0.1:8000/data/api-v/sdk/findskdid")
- 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
-}
-
-var UrlPort = 9000
-
-// 鍒涘缓 sdk server listen
-func NewSdkListen(sdkid string, protocol string, ip string, port int) (sid string, socket SocketContext, err error) {
-
+// create server
+func NewSdkSocketListen(mode int, sdkid string, url string) (sid string, socket SocketContext, err error) {
+ fmt.Println("url is: ", url)
ctx, cancel := context.WithCancel(context.Background())
-
- var url string
socket.Context = ctx
socket.Cancel = cancel
- switch protocol {
- case "tcp":
- if port == 0 {
- port = UrlPort
- UrlPort++
- }
- url = fmt.Sprintf("%s://%s:%d", protocol, ip, port)
+ socket.Sock = deliver.NewServer(deliver.Mode(mode), url)
- case "ipc":
- url = fmt.Sprintf("%s://%s", sdkid)
- }
- fmt.Printf("sdkid= %s url=%s\n", sdkid, url)
-
- if socket.Sock, err = pair.NewSocket(); err != nil {
- fmt.Println(sdkid, "can't get new pair socket: ", err.Error())
- return sdkid, socket, err
+ if socket.Sock == nil {
+ return sdkid, socket, errors.New("create listen error")
}
- socket.Sock.SetOption(mangos.OptionMaxRecvSize, 32*1024*1024)
- socket.Sock.SetOption(mangos.OptionWriteQLen, 10)
- socket.Sock.SetOption(mangos.OptionReadQLen, 10)
-
- socket.Sock.AddTransport(tcp.NewTransport())
- socket.Sock.AddTransport(ipc.NewTransport())
-
- if err = socket.Sock.Listen(url); err != nil {
- fmt.Println("socket lisnte error ", sdkid)
- }
SocketManage[sdkid] = socket
- return sdkid, socket, err
+ return sdkid, socket, nil
+}
+
+func NewSdkSocketDial(mode int, sdkid string, url string) (sid string, socket SocketContext, err error) {
+ fmt.Println("url is: ", url)
+ ctx, cancel := context.WithCancel(context.Background())
+
+ socket.Context = ctx
+ socket.Cancel = cancel
+
+ socket.Sock = deliver.NewClient(deliver.Mode(mode), url)
+
+ if socket.Sock == nil {
+ return sdkid, socket, errors.New("create listen error")
+ }
+
+ SocketManage[sdkid] = socket
+ return sdkid, socket, nil
}
func Recv(socket SocketContext) {
- socket.Sock.SetOption(mangos.OptionRecvDeadline, 1*time.Second)
var repsdkmsg = &protomsg.SdkMessage{}
for {
@@ -186,6 +191,7 @@
continue
} else {
err = proto.Unmarshal(msg, repsdkmsg)
+ fmt.Println("receive len: ", len(msg))
if err != nil {
fmt.Println("unmarshal error: ", err)
continue
@@ -198,24 +204,37 @@
}
}
-func send(sdkid string, socket SocketContext, in chan *protomsg.SdkMessage) {
+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)
- }
- fmt.Printf("浠庣閬搒dkid=%s 鎺ュ彈鏁版嵁 %d\n", sdkid, len(data))
+ 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()
- if err := socket.Sock.Send(data); err != nil {
- fmt.Println("failed send")
+ 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