From 6fd3413cfa70086864216c59718f7f4fc58b1acc Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期四, 27 六月 2019 14:19:31 +0800
Subject: [PATCH] add web interface
---
sdk/sdk.go | 73 +++++++++++++++++++++++-------------
1 files changed, 47 insertions(+), 26 deletions(-)
diff --git a/sdk/sdk.go b/sdk/sdk.go
index 7a1c554..07da4f6 100644
--- a/sdk/sdk.go
+++ b/sdk/sdk.go
@@ -4,13 +4,11 @@
"context"
"errors"
"fmt"
- "os"
// "github.com/long/test/httpclient"
"github.com/long/test/tasktag"
"github.com/long/test/util"
-
- "github.com/golang/protobuf/proto"
+ "github.com/gogo/protobuf/proto"
"basic.com/pubsub/protomsg.git"
"basic.com/valib/deliver.git"
@@ -38,35 +36,57 @@
fmt.Println()
}
+ // 鎵嬪姩杈撳叆鐨勪富棰�
SdkMap["es"] = make(chan protomsg.SdkMessage)
- fmt.Println("create es channel: ")
- go es(SdkMap["es"])
+ fmt.Println("create es channel: ")
+
+ SdkMap["virtual-faceextract-sdk-pull"] = make(chan protomsg.SdkMessage)
+ fmt.Println("create virtual-faceextract-sdk-pull")
+
+ Createwebserver("virtual-faceextract-sdk-pull")
+
+ go Dealextern()
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)
+ socketser, err := NewSdkSocketListen(deliver.PushPull, sdkid, url)
if err != nil {
- delete(SdkMap, sdkid)
+ delete(SdkMap, sdkid)
fmt.Println(sdkid, "create server error!")
return
}
- go Send(sdkidser, socketser, SdkMap[sdkid])
+
+
+ go Send(sdkid, socketser, SdkMap[sdkid])
url = fmt.Sprintf("ipc:///tmp/%s%s", sdkid, postPush)
- _, socketdial, err := NewSdkSocketListen(deliver.PushPull, sdkid, url)
+ socketdial, err := NewSdkSocketListen(deliver.PushPull, sdkid, url)
if err != nil {
- delete(SdkMap, sdkid)
+ delete(SdkMap, sdkid)
fmt.Println(sdkid, "create dial error!")
return
}
go Recv(socketdial)
}
+
+// web 鎺ュ彈绔鐞�
+func Createwebserver(webid string ){
+ url := fmt.Sprintf("ipc:///tmp/%s%s", webid, postPull)
+ socketser, err := NewSdkSocketListen(deliver.PushPull, webid, url)
+ if err != nil {
+ fmt.Println(webid, "create server error!")
+ return
+ }
+ go Send(webid, socketser, SdkMap[webid])
+}
+
func DeletesdkTopicandServer(sdkid string) {
close(SdkMap[sdkid])
delete(SdkMap, sdkid)
@@ -78,10 +98,13 @@
}
//鍗曠嫭澶勭悊 es 涓婚鐨勬儏鍐�
-func es(sdkmsgchan chan protomsg.SdkMessage) {
- for _ = range sdkmsgchan {
- fmt.Println("this data is finish all sdk! ")
- }
+func Dealextern() {
+ for {
+ select {
+ case esmsg:= <-SdkMap["es"]:
+ fmt.Println(esmsg)
+ }
+ }
}
//鍔ㄦ�佸鐞�
@@ -94,6 +117,7 @@
oldSdk = append(oldSdk, key)
}
util.Sdklist = append(util.Sdklist, "es")
+ util.Sdklist = append(util.Sdklist, "virtual-faceextract-sdk-pull")
sdkChanDel := util.Difference(oldSdk, util.Sdklist)
fmt.Println(sdkChanDel)
@@ -140,7 +164,7 @@
}
// create server
-func NewSdkSocketListen(mode int, sdkid string, url string) (sid string, socket SocketContext, err error) {
+func NewSdkSocketListen(mode int, sdkid string, url string) (socket SocketContext, err error) {
fmt.Println("url is: ", url)
ctx, cancel := context.WithCancel(context.Background())
@@ -150,11 +174,11 @@
socket.Sock = deliver.NewServer(deliver.Mode(mode), url)
if socket.Sock == nil {
- return sdkid, socket, errors.New("create listen error")
+ return socket, errors.New("create listen error")
}
SocketManage[sdkid] = socket
- return sdkid, socket, nil
+ return socket, nil
}
func NewSdkSocketDial(mode int, sdkid string, url string) (sid string, socket SocketContext, err error) {
@@ -175,7 +199,6 @@
}
func Recv(socket SocketContext) {
-
var repsdkmsg = protomsg.SdkMessage{}
for {
select {
@@ -191,13 +214,12 @@
fmt.Println("receive len: ", len(msg))
if err != nil {
fmt.Println("unmarshal error: ", err)
- os.Exit(1)
continue
- }
+ }
repsdkmsg.Tasklab.Index++
- //璋冪敤璁＄畻鍑芥暟锛� 鍒嗗彂缁欎笅涓�涓富棰�
- nexttopic := SdkSendTopic(repsdkmsg)
- SdkMap[nexttopic] <- repsdkmsg
+ //璋冪敤璁＄畻鍑芥暟锛� 鍒嗗彂缁欎笅涓�涓富棰�
+ nexttopic := SdkSendTopic(repsdkmsg)
+ SdkMap[nexttopic] <- repsdkmsg
}
}
}
@@ -218,11 +240,10 @@
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")
@@ -233,7 +254,7 @@
fmt.Println(sdkid, " 涓婚鍏抽棴, 鍏抽棴send()")
return
}
-
}
}
}
+}
--
Gitblit v1.8.0