From 3c8609a3da72cb2f3610f3f1789dafacc6c0f40f Mon Sep 17 00:00:00 2001
From: 龙赣华 <slongertian@gmail.com>
Date: 星期五, 31 五月 2019 11:13:58 +0800
Subject: [PATCH] add heartbeat
---
sdk/sdk.go | 43 +++++++++++++++----------------------------
1 files changed, 15 insertions(+), 28 deletions(-)
diff --git a/sdk/sdk.go b/sdk/sdk.go
index 19fcec1..0eddfb3 100644
--- a/sdk/sdk.go
+++ b/sdk/sdk.go
@@ -5,16 +5,21 @@
"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/pubsub/protomsg.git"
+ "basic.com/valib/deliver.git"
)
-//var doOnce sync.Once
+const (
+ postPull = "_1.ipc"
+ postPush = "_2.ipc"
+)
+
var SocketManage = make(map[string]SocketContext)
type SocketContext struct {
@@ -25,32 +30,26 @@
func Init() {
- sdklist := SdkAll() //鑾峰彇鎵�鏈塻dk
- fmt.Println("sdk list have: ", sdklist)
+ fmt.Println("============= init sdk info =====================")
+ SdkCreateTopic(util.Sdklist) // 鍒涘缓涓婚
- SdkCreateTopic(sdklist) // 鍒涘缓涓婚
-
- for _, sdkid := range sdklist { // 鍒涘缓sdk server
- url := fmt.Sprintf("%s%d", "tcp://192.168.1.124:", UrlPort)
+ 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
}
- UrlPort++
go Send(sdkidser, socketser, SdkMap[sdkid])
- url = fmt.Sprintf("%s%d", "tcp://192.168.1.124:", UrlPortR)
+ url = fmt.Sprintf("ipc:///tmp/%s%s", sdkid, postPush)
_, socketdial, err := NewSdkSocketListen(deliver.PushPull, sdkid, url)
if err != nil {
continue
}
- UrlPortR++
go Recv(socketdial)
}
-
go es(SdkMap["es"])
-
}
//鍗曠嫭澶勭悊 es 涓婚鐨勬儏鍐�
@@ -58,7 +57,6 @@
for _ = range sdkmsgchan {
fmt.Println("this data is finish all sdk! ")
}
-
}
//鍔ㄦ�佸鐞�
@@ -92,7 +90,6 @@
sdkmsg.Tasklab = nil
return sdkmsg
}
-
sdkmsg.Tasklab = tasktag.TaskMapLab[taskid]
sdkmsg.Data = data
return sdkmsg
@@ -105,15 +102,7 @@
} 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
}
@@ -129,9 +118,6 @@
return nil
}
-
-var UrlPort = 9000
-var UrlPortR = 9500
// create server
func NewSdkSocketListen(mode int, sdkid string, url string) (sid string, socket SocketContext, err error) {
@@ -216,6 +202,7 @@
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
}
--
Gitblit v1.8.0