From 70df7b912014201e271a2966599b84d77addd0f9 Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期二, 28 五月 2019 15:12:47 +0800
Subject: [PATCH] test all process

---
 sdk/sdk.go |   76 +++++++++++++++++++++++++-------------
 1 files changed, 50 insertions(+), 26 deletions(-)

diff --git a/sdk/sdk.go b/sdk/sdk.go
index 4371c1f..9a4715f 100644
--- a/sdk/sdk.go
+++ b/sdk/sdk.go
@@ -5,17 +5,25 @@
 	"errors"
 	"fmt"
 
-	"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"
 
 	"github.com/golang/protobuf/proto"
-	"github.com/long/test/deliver"
+
+	"basic.com/valib/deliver.git"
+	"basic.com/pubsub/protomsg.git"
+    "basic.com/dbapi.git"
 )
 
-//var doOnce sync.Once
+const (
+    postPull="_1.ipc"
+    postPush="_2.ipc"
+)
+
 var SocketManage = make(map[string]SocketContext)
+
+var sdkapi dbapi.SdkApi
 
 type SocketContext struct {
 	Sock    deliver.Deliver
@@ -25,32 +33,34 @@
 
 func Init() {
 
+    fmt.Println("============= init sdk info =====================")
 	sdklist := SdkAll() //鑾峰彇鎵�鏈塻dk
-	fmt.Println("sdk list have: ", sdklist)
-
 	SdkCreateTopic(sdklist) // 鍒涘缓涓婚
 
 	for _, sdkid := range sdklist { // 鍒涘缓sdk server
-		url := fmt.Sprintf("%s%d", "tcp://192.168.1.124:", UrlPort)
-		sdkid, socket, err := NewSdkSocketListen(deliver.PushPull, sdkid, url)
+        url := fmt.Sprintf("ipc:///tmp/%s%s",sdkid,postPull)
+		sdkidser, socketser, err := NewSdkSocketListen(deliver.PushPull, sdkid, url)
 		if err != nil {
 			continue
 		}
-		go Send(sdkid, socket, SdkMap[sdkid])
-		//break
-		//	Recv(socket)
+		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)
+
 	}
-
 	go es(SdkMap["es"])
-
 }
 
 //鍗曠嫭澶勭悊   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! ")
 	}
-
 }
 
 //鍔ㄦ�佸鐞�
@@ -84,7 +94,6 @@
 		sdkmsg.Tasklab = nil
 		return sdkmsg
 	}
-
 	sdkmsg.Tasklab = tasktag.TaskMapLab[taskid]
 	sdkmsg.Data = data
 	return sdkmsg
@@ -97,15 +106,14 @@
 	} 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")
+	//sdklist = httpclient.GetSdk("http://192.168.1.124:8000/data/api-v/sdk/findskdid")
+    sdklist = sdkapi.GetAllSdkIds()
 	return
 }
 
@@ -122,7 +130,6 @@
 	return nil
 }
 
-var UrlPort = 9000
 
 // create server
 func NewSdkSocketListen(mode int, sdkid string, url string) (sid string, socket SocketContext, err error) {
@@ -140,7 +147,24 @@
 	}
 
 	SocketManage[sdkid] = socket
-	UrlPort++
+	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)
+	fmt.Println(sdkid, socket.Sock)
+
+	if socket.Sock == nil {
+		return sdkid, socket, errors.New("create listen error")
+	}
+
+	SocketManage[sdkid] = socket
 	return sdkid, socket, nil
 }
 
@@ -159,6 +183,7 @@
 				continue
 			} else {
 				err = proto.Unmarshal(msg, repsdkmsg)
+				fmt.Println("receive len: ", len(msg))
 				if err != nil {
 					fmt.Println("unmarshal error: ", err)
 					continue
@@ -182,19 +207,18 @@
 			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.Printf("sdkid = %s ,send success:%d \n", sdkid, len(data))
-			//	go func(sock SocketContext) {
-			//		doOnce.Do(func() { Recv(sock) })
-
-			//	}(socket)
 		}
 	}
 }

--
Gitblit v1.8.0