From 5083277b55e704606a1d198e470f143780e45ce7 Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期六, 29 六月 2019 18:55:35 +0800
Subject: [PATCH] deploy 203
---
util/sqlite.go | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/util/sqlite.go b/util/sqlite.go
index 4f3e000..04d4b84 100644
--- a/util/sqlite.go
+++ b/util/sqlite.go
@@ -3,10 +3,11 @@
import (
"fmt"
+ "flag"
"basic.com/pubsub/protomsg.git"
- "basic.com/r/dbapi.git"
+ "basic.com/dbapi.git"
"github.com/gogo/protobuf/proto"
- "github.com/long/test/gopherdiscovery"
+ "basic.com/valib/gopherdiscovery.git"
)
/*************************
@@ -24,19 +25,23 @@
var CameraTasks []protomsg.CameraAndTaskInfo
var TaskSdks []protomsg.TaskSdkInfo
+
var Sdklist []string
+var Sdkinfos []protomsg.Sdk
-//var urlServer = "tcp://192.168.1.11:40007"
-//var urlPubSub = "tcp://192.168.1.11:50007"
+var urlServer = flag.String("urlServer","tcp://127.0.0.1:40007","heartbeat address of url server")
+var urlPubSub = flag.String("urlPubsub","tcp://127.0.0.1:5007", "heartbeat pubsub address of url server")
-var urlServer = "tcp://127.0.0.1:40007"
-var urlPubSub = "tcp://127.0.0.1:50007"
+var dbip = flag.String("dbip","127.0.0.1","address of database ip")
+var dbport = flag.Int("dbport", 8001, "port of database port")
var Sdkflag = make(chan bool)
var TaskSdkflag = make(chan bool)
var Cameraflag = make(chan bool)
var newsdkmsg = &protomsg.DbChangeMessage{}
+
+
func processinit(initchan chan bool) {
CameraIds = camval.FindAll()
@@ -48,6 +53,7 @@
TaskSdks = taskapi.FindAll()
Sdklist = sdkapi.GetAllSdkIds()
+ Sdkinfos = sdkapi.FindAll("")
initchan <- true
}
@@ -76,6 +82,7 @@
case protomsg.TableChanged_T_Sdk:
fmt.Println("update sdk")
Sdklist = sdkapi.GetAllSdkIds()
+ Sdkinfos = sdkapi.FindAll("")
Sdkflag <- true
fmt.Println("update finished!")
@@ -86,14 +93,14 @@
}
func Init(initchan chan bool) {
- clientOne, _ := gopherdiscovery.ClientWithSub(urlServer, urlPubSub, "ip:192.168.1.124")
+ dbapi.Init(*dbip, *dbport)
+ clientOne, _ := gopherdiscovery.ClientWithSub(*urlServer, *urlPubSub, "ip:local")
recvinit := clientOne.HeartBeatMsg()
fmt.Println(<-recvinit)
processinit(initchan)
peers, _ := clientOne.Peers()
for x := range peers {
- fmt.Println("client: ", x)
Getdata(x)
}
}
--
Gitblit v1.8.0