From 7183fd16c435d2aaf85e24d3608c5c43645ee608 Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期三, 10 七月 2019 09:42:27 +0800
Subject: [PATCH] remove sdkname, sdkid, add ipc_id
---
util/sqlite.go | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/util/sqlite.go b/util/sqlite.go
index f06b3e3..e9b9021 100644
--- a/util/sqlite.go
+++ b/util/sqlite.go
@@ -3,10 +3,11 @@
import (
"fmt"
+ "flag"
"basic.com/pubsub/protomsg.git"
"basic.com/dbapi.git"
"github.com/gogo/protobuf/proto"
- "github.com/long/test/gopherdiscovery"
+ "basic.com/valib/gopherdiscovery.git"
)
/*************************
@@ -23,22 +24,25 @@
var CameraIds []protomsg.Camera
var CameraTasks []protomsg.CameraAndTaskInfo
-var TaskSdks []protomsg.TaskSdkInfo
+//var TaskSdks []protomsg.TaskSdkInfo
+var TaskSdks []protomsg.TaskSdkRun
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()
@@ -47,7 +51,7 @@
CameraTasks = camval.FindAllCameraAndTask()
fmt.Println(CameraTasks)
- TaskSdks = taskapi.FindAll()
+ TaskSdks = taskapi.FindAllTaskSdkRun()
Sdklist = sdkapi.GetAllSdkIds()
Sdkinfos = sdkapi.FindAll("")
@@ -73,7 +77,7 @@
case protomsg.TableChanged_T_TaskSdk:
fmt.Println("update tasksdk")
- TaskSdks = taskapi.FindAll()
+ TaskSdks = taskapi.FindAllTaskSdkRun()
TaskSdkflag <- true
case protomsg.TableChanged_T_Sdk:
@@ -90,7 +94,8 @@
}
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)
--
Gitblit v1.8.0