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 |   32 ++++++++++----------------------
 1 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/sdk/sdk.go b/sdk/sdk.go
index 9a4715f..0eddfb3 100644
--- a/sdk/sdk.go
+++ b/sdk/sdk.go
@@ -5,25 +5,22 @@
 	"errors"
 	"fmt"
 
-//	"github.com/long/test/httpclient"
+	//	"github.com/long/test/httpclient"
 	"github.com/long/test/tasktag"
 	"github.com/long/test/util"
 
 	"github.com/golang/protobuf/proto"
 
-	"basic.com/valib/deliver.git"
 	"basic.com/pubsub/protomsg.git"
-    "basic.com/dbapi.git"
+	"basic.com/valib/deliver.git"
 )
 
 const (
-    postPull="_1.ipc"
-    postPush="_2.ipc"
+	postPull = "_1.ipc"
+	postPush = "_2.ipc"
 )
 
 var SocketManage = make(map[string]SocketContext)
-
-var sdkapi dbapi.SdkApi
 
 type SocketContext struct {
 	Sock    deliver.Deliver
@@ -33,19 +30,18 @@
 
 func Init() {
 
-    fmt.Println("============= init sdk info =====================")
-	sdklist := SdkAll() //鑾峰彇鎵�鏈塻dk
-	SdkCreateTopic(sdklist) // 鍒涘缓涓婚
+	fmt.Println("============= init sdk info =====================")
+	SdkCreateTopic(util.Sdklist) // 鍒涘缓涓婚
 
-	for _, sdkid := range sdklist { // 鍒涘缓sdk server
-        url := fmt.Sprintf("ipc:///tmp/%s%s",sdkid,postPull)
+	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)
+		url = fmt.Sprintf("ipc:///tmp/%s%s", sdkid, postPush)
 		_, socketdial, err := NewSdkSocketListen(deliver.PushPull, sdkid, url)
 		if err != nil {
 			continue
@@ -110,13 +106,6 @@
 	return
 }
 
-// 璋冪敤  http 鍊熷彛鑾峰彇鎽勫儚鏈轰俊鎭�
-func SdkAll() (sdklist []string) {
-	//sdklist = httpclient.GetSdk("http://192.168.1.124:8000/data/api-v/sdk/findskdid")
-    sdklist = sdkapi.GetAllSdkIds()
-	return
-}
-
 // 鍒涘缓涓婚
 func SdkCreateTopic(sdklist []string) (err error) {
 	for _, sdkid := range sdklist {
@@ -129,7 +118,6 @@
 
 	return nil
 }
-
 
 // create server
 func NewSdkSocketListen(mode int, sdkid string, url string) (sid string, socket SocketContext, err error) {
@@ -214,7 +202,7 @@
 
 			fmt.Println("send len of data: ", len(data))
 			if err := socket.Sock.Send(data); err != nil {
-                fmt.Println(socket.Sock)
+				fmt.Println(socket.Sock)
 				fmt.Println("failed send")
 				continue
 			}

--
Gitblit v1.8.0