From 2bc5d0350ba5bb948aeaf54ecfa59f33eeb6004b Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期三, 24 七月 2019 14:25:55 +0800
Subject: [PATCH] github.com/long/taskpubsub ==> taskpubsub
---
util/sqlite.go | 56 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 33 insertions(+), 23 deletions(-)
diff --git a/util/sqlite.go b/util/sqlite.go
index 35a6a9a..18973b6 100644
--- a/util/sqlite.go
+++ b/util/sqlite.go
@@ -1,12 +1,13 @@
package util
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"
+ "taskpubsub/logger"
)
/*************************
@@ -23,14 +24,17 @@
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:50007", "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)
@@ -38,62 +42,68 @@
var newsdkmsg = &protomsg.DbChangeMessage{}
+
+
func processinit(initchan chan bool) {
CameraIds = camval.FindAll()
- fmt.Println("==============camera camera with task ================")
+ logger.Info("==============camera camera with task ================")
CameraTasks = camval.FindAllCameraAndTask()
- fmt.Println(CameraTasks)
+ logger.Info(CameraTasks)
- TaskSdks = taskapi.FindAll()
+ TaskSdks = taskapi.FindAllTaskSdkRun()
Sdklist = sdkapi.GetAllSdkIds()
+ Sdkinfos = sdkapi.FindAll("")
initchan <- true
}
func Getdata(opt []byte) {
if err := proto.Unmarshal(opt, newsdkmsg); err != nil {
- fmt.Println("publichshMessage ", err)
+ logger.Error("publichshMessage ", err)
return
}
switch newsdkmsg.Table {
case protomsg.TableChanged_T_Camera:
- fmt.Println("update camera")
+ logger.Info("update camera")
CameraIds = camval.FindAll()
Cameraflag <- true
+ logger.Info("update camera finish.")
case protomsg.TableChanged_T_CameraTask:
- fmt.Println("update cameratask")
+ logger.Info("update cameratask")
CameraTasks = camval.FindAllCameraAndTask()
- fmt.Println("update cameratask finished!")
+ logger.Info("update cameratask finished!")
case protomsg.TableChanged_T_TaskSdk:
- fmt.Println("update tasksdk")
- TaskSdks = taskapi.FindAll()
+ logger.Info("update tasksdk")
+ TaskSdks = taskapi.FindAllTaskSdkRun()
TaskSdkflag <- true
case protomsg.TableChanged_T_Sdk:
- fmt.Println("update sdk")
+ logger.Info("update sdk")
Sdklist = sdkapi.GetAllSdkIds()
+ Sdkinfos = sdkapi.FindAll("")
Sdkflag <- true
- fmt.Println("update finished!")
default:
- fmt.Println("unknow type operation")
+ logger.Info("unknow type operation")
}
- fmt.Println(newsdkmsg)
+
+ logger.Info(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)
+ _ = <-recvinit
+
processinit(initchan)
peers, _ := clientOne.Peers()
for x := range peers {
- fmt.Println("client: ", x)
Getdata(x)
}
}
--
Gitblit v1.8.0