From 40d864645ff608e3a81d115fef26bba87954be2c Mon Sep 17 00:00:00 2001
From: 554325746@qq.com <554325746@qq.com>
Date: 星期一, 22 七月 2019 18:42:06 +0800
Subject: [PATCH] add log and fix pubusb
---
util/sqlite.go | 36 +++++++++++++++---------------------
1 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/util/sqlite.go b/util/sqlite.go
index 958aff5..5b3c4d0 100644
--- a/util/sqlite.go
+++ b/util/sqlite.go
@@ -1,14 +1,13 @@
package util
import (
- "fmt"
"flag"
"basic.com/pubsub/protomsg.git"
"basic.com/dbapi.git"
"github.com/gogo/protobuf/proto"
"basic.com/valib/gopherdiscovery.git"
- "os"
+ "github.com/long/test/logger"
)
/*************************
@@ -32,7 +31,7 @@
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 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 dbport = flag.Int("dbport", 8001, "port of database port")
@@ -48,9 +47,9 @@
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.FindAllTaskSdkRun()
@@ -61,55 +60,50 @@
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")
- os.Exit(1)
+ logger.Info("update camera")
CameraIds = camval.FindAll()
Cameraflag <- true
+ 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("update cameratask finished!")
case protomsg.TableChanged_T_TaskSdk:
- fmt.Println("update tasksdk")
- os.Exit(1)
+ logger.Info("update tasksdk")
TaskSdks = taskapi.FindAllTaskSdkRun()
TaskSdkflag <- true
case protomsg.TableChanged_T_Sdk:
- fmt.Println("update sdk")
- os.Exit(1)
+ logger.Info("update sdk")
Sdklist = sdkapi.GetAllSdkIds()
Sdkinfos = sdkapi.FindAll("")
Sdkflag <- true
- fmt.Println("update 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)
+ _ = <-recvinit
+
processinit(initchan)
peers, _ := clientOne.Peers()
for x := range peers {
Getdata(x)
- os.Exit(1)
}
}
--
Gitblit v1.8.0