From b5560d3cae1164f016ca9339592eda6b9008fb9f Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期六, 27 七月 2019 12:31:29 +0800
Subject: [PATCH] 重构代码
---
util/sqlite.go | 43 ++++++++++++++++++++-----------------------
1 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/util/sqlite.go b/util/sqlite.go
index 18973b6..fce2371 100644
--- a/util/sqlite.go
+++ b/util/sqlite.go
@@ -1,13 +1,12 @@
package util
import (
-
- "flag"
- "basic.com/pubsub/protomsg.git"
"basic.com/dbapi.git"
+ "basic.com/pubsub/protomsg.git"
+ "basic.com/valib/gopherdiscovery.git"
+ "flag"
"github.com/gogo/protobuf/proto"
- "basic.com/valib/gopherdiscovery.git"
- "taskpubsub/logger"
+ "taskpubsub/logger"
)
/*************************
@@ -25,15 +24,15 @@
var CameraTasks []protomsg.CameraAndTaskInfo
//var TaskSdks []protomsg.TaskSdkInfo
-var TaskSdks []protomsg.TaskSdkRun
+var TaskSdks []protomsg.TaskSdkRun
var Sdklist []string
var Sdkinfos []protomsg.Sdk
-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:50007", "heartbeat pubsub address of url server")
+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:50007", "heartbeat pubsub address of url server")
-var dbip = flag.String("dbip","127.0.0.1","address of database ip")
+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)
@@ -42,23 +41,21 @@
var newsdkmsg = &protomsg.DbChangeMessage{}
-
-
-func processinit(initchan chan bool) {
+func initDbData(initchan chan bool) {
CameraIds = camval.FindAll()
logger.Info("==============camera camera with task ================")
CameraTasks = camval.FindAllCameraAndTask()
- logger.Info(CameraTasks)
+ logger.Info(CameraTasks)
TaskSdks = taskapi.FindAllTaskSdkRun()
Sdklist = sdkapi.GetAllSdkIds()
- Sdkinfos = sdkapi.FindAll("")
+ Sdkinfos = sdkapi.FindAll("")
initchan <- true
}
-func Getdata(opt []byte) {
+func updateDbData(opt []byte) {
if err := proto.Unmarshal(opt, newsdkmsg); err != nil {
logger.Error("publichshMessage ", err)
return
@@ -69,7 +66,7 @@
logger.Info("update camera")
CameraIds = camval.FindAll()
Cameraflag <- true
- logger.Info("update camera finish.")
+ logger.Info("update camera finish.")
case protomsg.TableChanged_T_CameraTask:
logger.Info("update cameratask")
@@ -84,7 +81,7 @@
case protomsg.TableChanged_T_Sdk:
logger.Info("update sdk")
Sdklist = sdkapi.GetAllSdkIds()
- Sdkinfos = sdkapi.FindAll("")
+ Sdkinfos = sdkapi.FindAll("")
Sdkflag <- true
default:
@@ -95,15 +92,15 @@
}
func Init(initchan chan bool) {
- dbapi.Init(*dbip, *dbport)
- clientOne, _ := gopherdiscovery.ClientWithSub(*urlServer, *urlPubSub, "ip:local")
- recvinit := clientOne.HeartBeatMsg()
+ dbapi.Init(*dbip, *dbport)
+ client, _ := gopherdiscovery.ClientWithSub(*urlServer, *urlPubSub, "ip:local")
+ recvinit := client.HeartBeatMsg()
_ = <-recvinit
- processinit(initchan)
+ initDbData(initchan)
- peers, _ := clientOne.Peers()
+ peers, _ := client.Peers()
for x := range peers {
- Getdata(x)
+ updateDbData(x)
}
}
--
Gitblit v1.8.0