From 3fc4fa8f8bf65030ee0969d73f958b11d90b7daf Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 17 十二月 2019 17:17:52 +0800
Subject: [PATCH] add log
---
util/sqlite.go | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/util/sqlite.go b/util/sqlite.go
index fce2371..3ee87ca 100644
--- a/util/sqlite.go
+++ b/util/sqlite.go
@@ -1,12 +1,13 @@
package util
import (
+ "flag"
+
"basic.com/dbapi.git"
"basic.com/pubsub/protomsg.git"
"basic.com/valib/gopherdiscovery.git"
- "flag"
+ "basic.com/valib/logger.git"
"github.com/gogo/protobuf/proto"
- "taskpubsub/logger"
)
/*************************
@@ -18,9 +19,11 @@
var camval dbapi.CameraApi
var taskapi dbapi.TaskApi
var sdkapi dbapi.SdkApi
+var fileApi dbapi.FileAnalysisApi
var IsInit bool
var CameraIds []protomsg.Camera
+var FileArr []protomsg.FileAnalysis
var CameraTasks []protomsg.CameraAndTaskInfo
//var TaskSdks []protomsg.TaskSdkInfo
@@ -29,24 +32,26 @@
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://0.0.0.0:40007", "heartbeat address of url server")
+var urlPubSub = flag.String("urlPubsub", "tcp://0.0.0.0: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", "0.0.0.0", "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 Fileflag = make(chan bool)
var newsdkmsg = &protomsg.DbChangeMessage{}
func initDbData(initchan chan bool) {
CameraIds = camval.FindAll()
+ FileArr, _ = fileApi.GetAnalysisFiles()
+
logger.Info("==============camera camera with task ================")
CameraTasks = camval.FindAllCameraAndTask()
- logger.Info(CameraTasks)
TaskSdks = taskapi.FindAllTaskSdkRun()
@@ -57,7 +62,7 @@
func updateDbData(opt []byte) {
if err := proto.Unmarshal(opt, newsdkmsg); err != nil {
- logger.Error("publichshMessage ", err)
+ logger.Error("publish Message ", err)
return
}
@@ -67,6 +72,11 @@
CameraIds = camval.FindAll()
Cameraflag <- true
logger.Info("update camera finish.")
+ case protomsg.TableChanged_T_File:
+ logger.Info("update analysis files")
+ FileArr, _ = fileApi.GetAnalysisFiles()
+ Fileflag <- true
+ logger.Info("update files finish.")
case protomsg.TableChanged_T_CameraTask:
logger.Info("update cameratask")
@@ -77,18 +87,20 @@
logger.Info("update tasksdk")
TaskSdks = taskapi.FindAllTaskSdkRun()
TaskSdkflag <- true
+ logger.Info("update tasksdk finished!")
case protomsg.TableChanged_T_Sdk:
logger.Info("update sdk")
Sdklist = sdkapi.GetAllSdkIds()
Sdkinfos = sdkapi.FindAll("")
Sdkflag <- true
+ logger.Info("update Sdkinfos finished!")
default:
- logger.Info("unknow type operation")
+ logger.Info("other type operation")
}
- logger.Info(newsdkmsg)
+ //logger.Info(newsdkmsg)
}
func Init(initchan chan bool) {
--
Gitblit v1.8.0