From 9389544d4cc56ef00084e8dbb6afb73e1ec00eca Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期三, 11 九月 2019 17:30:43 +0800
Subject: [PATCH] 改成使用valib的logger，增加一些日志输出
---
util/sqlite.go | 78 +++++++++++++++++++--------------------
1 files changed, 38 insertions(+), 40 deletions(-)
diff --git a/util/sqlite.go b/util/sqlite.go
index 958aff5..3ba767e 100644
--- a/util/sqlite.go
+++ b/util/sqlite.go
@@ -1,14 +1,12 @@
package util
import (
- "fmt"
-
- "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"
- "os"
+ "taskpubsub/logger"
)
/*************************
@@ -26,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:5007", "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)
@@ -43,73 +41,73 @@
var newsdkmsg = &protomsg.DbChangeMessage{}
-
-
-func processinit(initchan chan bool) {
+func initDbData(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.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 {
- fmt.Println("publichshMessage ", err)
+ logger.Error("publichshMessage ", err)
return
}
switch newsdkmsg.Table {
case protomsg.TableChanged_T_Camera:
- fmt.Println("update camera")
- os.Exit(1)
+ logger.Info("update camera")
CameraIds = camval.FindAll()
Cameraflag <- true
+ logger.Info(CameraIds)
+ logger.Info("update camera finish.")
case protomsg.TableChanged_T_CameraTask:
- fmt.Println("update cameratask")
- os.Exit(1)
+ logger.Info("update cameratask")
CameraTasks = camval.FindAllCameraAndTask()
- fmt.Println("update cameratask finished!")
+ logger.Info(CameraTasks)
+ logger.Info("update cameratask finished!")
case protomsg.TableChanged_T_TaskSdk:
- fmt.Println("update tasksdk")
- os.Exit(1)
+ logger.Info("update tasksdk")
TaskSdks = taskapi.FindAllTaskSdkRun()
TaskSdkflag <- true
+ logger.Info(TaskSdks)
+ logger.Info("update tasksdk finished!")
case protomsg.TableChanged_T_Sdk:
- fmt.Println("update sdk")
- os.Exit(1)
+ logger.Info("update sdk")
Sdklist = sdkapi.GetAllSdkIds()
- Sdkinfos = sdkapi.FindAll("")
+ Sdkinfos = sdkapi.FindAll("")
Sdkflag <- true
- fmt.Println("update finished!")
+ logger.Info(Sdklist)
+ logger.Info(Sdkinfos)
+ logger.Info("update Sdkinfos finished!")
default:
- fmt.Println("unknow type operation")
- os.Exit(1)
+ logger.Info("unknow type operation")
}
- fmt.Println(newsdkmsg)
+ //logger.Info(newsdkmsg)
}
func Init(initchan chan bool) {
- dbapi.Init(*dbip, *dbport)
- clientOne, _ := gopherdiscovery.ClientWithSub(*urlServer, *urlPubSub, "ip:local")
- recvinit := clientOne.HeartBeatMsg()
- fmt.Println(<-recvinit)
- processinit(initchan)
+ dbapi.Init(*dbip, *dbport)
+ client, _ := gopherdiscovery.ClientWithSub(*urlServer, *urlPubSub, "ip:local")
+ recvinit := client.HeartBeatMsg()
+ _ = <-recvinit
- peers, _ := clientOne.Peers()
+ initDbData(initchan)
+
+ peers, _ := client.Peers()
for x := range peers {
- Getdata(x)
- os.Exit(1)
+ updateDbData(x)
}
}
--
Gitblit v1.8.0