From 5a0e125d6b05c42cf26d3e341249be7a2fd80d6d Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期一, 22 七月 2019 13:39:28 +0800
Subject: [PATCH] release without log
---
util/sqlite.go | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/util/sqlite.go b/util/sqlite.go
index 35a6a9a..958aff5 100644
--- a/util/sqlite.go
+++ b/util/sqlite.go
@@ -3,10 +3,12 @@
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"
+ "os"
)
/*************************
@@ -23,20 +25,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()
@@ -45,9 +52,10 @@
CameraTasks = camval.FindAllCameraAndTask()
fmt.Println(CameraTasks)
- TaskSdks = taskapi.FindAll()
+ TaskSdks = taskapi.FindAllTaskSdkRun()
Sdklist = sdkapi.GetAllSdkIds()
+ Sdkinfos = sdkapi.FindAll("")
initchan <- true
}
@@ -60,40 +68,48 @@
switch newsdkmsg.Table {
case protomsg.TableChanged_T_Camera:
fmt.Println("update camera")
+ os.Exit(1)
CameraIds = camval.FindAll()
Cameraflag <- true
case protomsg.TableChanged_T_CameraTask:
fmt.Println("update cameratask")
+ os.Exit(1)
CameraTasks = camval.FindAllCameraAndTask()
fmt.Println("update cameratask finished!")
case protomsg.TableChanged_T_TaskSdk:
fmt.Println("update tasksdk")
- TaskSdks = taskapi.FindAll()
+ os.Exit(1)
+ TaskSdks = taskapi.FindAllTaskSdkRun()
TaskSdkflag <- true
case protomsg.TableChanged_T_Sdk:
fmt.Println("update sdk")
+ os.Exit(1)
Sdklist = sdkapi.GetAllSdkIds()
+ Sdkinfos = sdkapi.FindAll("")
Sdkflag <- true
fmt.Println("update finished!")
default:
fmt.Println("unknow type operation")
+ os.Exit(1)
}
+
fmt.Println(newsdkmsg)
}
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)
+ os.Exit(1)
}
}
--
Gitblit v1.8.0