From d30dfa5952c21e88210004a6341a16eb0ee68e2e Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 23 十二月 2019 09:30:53 +0800
Subject: [PATCH] update
---
/dev/null | 109 ------------------------------------
go.sum | 11 ---
go.mod | 5 -
3 files changed, 1 insertions(+), 124 deletions(-)
diff --git a/db.go b/db.go
deleted file mode 100644
index 3b3e278..0000000
--- a/db.go
+++ /dev/null
@@ -1,109 +0,0 @@
-package main
-
-import (
- "fmt"
- "strconv"
-
- "basic.com/dbapi.git"
- "basic.com/libgowrapper/sdkstruct.git"
- "basic.com/pubsub/cache.git/shardmap"
- "basic.com/pubsub/protomsg.git"
- "basic.com/valib/gopherdiscovery.git"
- "github.com/gogo/protobuf/proto"
-)
-
-const (
- prefixTASKSDKRULE = "TASKSDKRULE_"
-)
-
-var cMap *shardmap.ShardMap
-
-// InitDBAPI init dbapi
-func InitDBAPI(ip string, httpPort, heartBeatPort, dataPort int, log func(...interface{})) {
- dbapi.Init(ip, httpPort)
- var initchan = make(chan bool)
- go InitCache(initchan, ip, heartBeatPort, dataPort)
- log("db init done!", <-initchan)
-}
-
-// TaskInfos get camera infos from sqlite db
-func TaskInfos() []protomsg.TaskSdkInfo {
- tAPI := dbapi.TaskApi{}
- tasks := tAPI.FindAll()
-
- return tasks
-}
-
-// SDKInfo get sdk
-func SDKInfo() []sdkstruct.SDKInfo {
- sAPI := dbapi.SdkApi{}
-
- s := sAPI.FindAllSdkRun()
- var sdks []sdkstruct.SDKInfo
- for _, v := range s {
- sdks = append(sdks, sdkstruct.SDKInfo{
- IpcID: v.IpcId,
- SdkType: v.SdkType,
- })
- }
- return sdks
-}
-
-// InitCache cache
-func InitCache(initChan chan bool, dbIP string, surveyPort int, pubSubPort int) {
- cMap = shardmap.New(uint8(32))
- urlSurvey := "tcp://" + dbIP + ":" + strconv.Itoa(surveyPort)
- urlPubSub := "tcp://" + dbIP + ":" + strconv.Itoa(pubSubPort)
- client, _ := gopherdiscovery.ClientWithSub(urlSurvey, urlPubSub, "analysisProc")
- recvMsg := client.HeartBeatMsg()
- fmt.Println(<-recvMsg)
-
- initCacheData(initChan)
-
- peers, _ := client.Peers()
- for b := range peers {
- fmt.Println("peerMsg:", b)
- updateData(b)
- }
-}
-
-func initCacheData(initChan chan bool) {
- initTaskSdkRule()
- initChan <- true
-}
-
-func initTaskSdkRule() {
- var api dbapi.TaskSdkRuleApi
-
- b, rules := api.FindAllTaskSdkRules()
- if b {
- if rules != nil {
- for _, tRule := range rules {
- cMap.Set(prefixTASKSDKRULE+tRule.TaskId, tRule.SdkRules)
- }
- }
- }
-}
-
-func updateData(b []byte) {
- newUpdateMsg := &protomsg.DbChangeMessage{}
- if err := proto.Unmarshal(b, newUpdateMsg); err != nil {
- fmt.Println("dbChangeMsg unmarshal err:", err)
- return
- }
- switch newUpdateMsg.Table {
- case protomsg.TableChanged_T_TaskSdkRule:
- initTaskSdkRule()
- default:
-
- }
-}
-
-// GetTaskSdkRules rules
-func GetTaskSdkRules(taskID string) []*protomsg.SdkRuleSet {
- r, b := cMap.Get(prefixTASKSDKRULE + taskID)
- if b {
- return r.([]*protomsg.SdkRuleSet)
- }
- return nil
-}
diff --git a/go.mod b/go.mod
index 8a6f535..f4a62b6 100644
--- a/go.mod
+++ b/go.mod
@@ -3,20 +3,15 @@
go 1.12
require (
- basic.com/dbapi.git v0.0.0-20191216030028-03153c1f1f30
basic.com/libgowrapper/sdkhelper.git v0.0.0-20191220070838-2d836fec8448
basic.com/libgowrapper/sdkstruct.git v0.0.0-20191220011601-e0b3d1f0183c
- basic.com/pubsub/cache.git v0.0.0-20190718093725-6a413e1d7d48
basic.com/pubsub/protomsg.git v0.0.0-20191219033725-b95da65535d0
basic.com/valib/deliver.git v0.0.0-20190927081905-2d390df9ede3 // indirect
basic.com/valib/gogpu.git v0.0.0-20190711044327-62043b070865
- basic.com/valib/gopherdiscovery.git v0.0.0-20190605034340-15d89d8b4e28
basic.com/valib/shm.git v0.0.0-20191029034255-156e610f9bca // indirect
- github.com/ajg/form v1.5.1 // indirect
github.com/gogo/protobuf v1.3.1
github.com/gorilla/websocket v1.4.1 // indirect
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3 // indirect
- golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 // indirect
golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135 // indirect
google.golang.org/grpc v1.26.0 // indirect
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc // indirect
diff --git a/go.sum b/go.sum
index 848d0d0..e1451f6 100644
--- a/go.sum
+++ b/go.sum
@@ -1,25 +1,17 @@
-basic.com/dbapi.git v0.0.0-20191216030028-03153c1f1f30 h1:nesVta2Rf3LAqyFtGAqNOI+Mf9SqHa4gz1Dj38nm5bk=
-basic.com/dbapi.git v0.0.0-20191216030028-03153c1f1f30/go.mod h1:eDXPnxaz6jZPDvBSk7ya7oSASWPCuUEgRTJCjsfKt/Q=
basic.com/libgowrapper/sdkhelper.git v0.0.0-20191220070838-2d836fec8448 h1:fnzmik70HiNRSdeH7QHT+bqEy+eSfSSmXSZOWDff4G4=
basic.com/libgowrapper/sdkhelper.git v0.0.0-20191220070838-2d836fec8448/go.mod h1:eBHanxa92Srb5c/OmupgcAZmLC3Et5HMp9JsebHAIC4=
basic.com/libgowrapper/sdkstruct.git v0.0.0-20191220011601-e0b3d1f0183c h1:maWYZw9iSQUuN1jbDxgi9IvKrCD97tiTCv8PkLArZ/I=
basic.com/libgowrapper/sdkstruct.git v0.0.0-20191220011601-e0b3d1f0183c/go.mod h1:bNdkzVVGY+oQEcaYN9VlyIK/03WB3NQNQApjiPJjIag=
-basic.com/pubsub/cache.git v0.0.0-20190718093725-6a413e1d7d48 h1:BBA30Rgljn6MRieC4gUncETJDyna3ObyubTo9HEQ2M0=
-basic.com/pubsub/cache.git v0.0.0-20190718093725-6a413e1d7d48/go.mod h1:gHLJZz2ee1cGL0X0ae69fs56bAxkDgEQwDhhXZJNUcY=
basic.com/pubsub/protomsg.git v0.0.0-20191219033725-b95da65535d0 h1:5NOX81GTsRLwbhnHWYU4g6jfcOynSWetmf9PlhK5eLI=
basic.com/pubsub/protomsg.git v0.0.0-20191219033725-b95da65535d0/go.mod h1:un5NV5VWQoblVLZfx1Rt5vyLgwR0jI92d3VJhfrJhWU=
basic.com/valib/deliver.git v0.0.0-20190927081905-2d390df9ede3 h1:VY23IpugB/FsU2hSnVeLjZKX5cSgNmhcSEiw6vxX+bg=
basic.com/valib/deliver.git v0.0.0-20190927081905-2d390df9ede3/go.mod h1:bkYiTUGzckyNOjAgn9rB/DOjFzwoSHJlruuWQ6hu6IY=
basic.com/valib/gogpu.git v0.0.0-20190711044327-62043b070865 h1:3XvkNdRlJDXV45ie8U0uGA9ImJZtyTT0C/h+4Rizv0Y=
basic.com/valib/gogpu.git v0.0.0-20190711044327-62043b070865/go.mod h1:yxux5RP4A6a591vWljXxGlHdERVVyWDD3TwwQjuyogw=
-basic.com/valib/gopherdiscovery.git v0.0.0-20190605034340-15d89d8b4e28 h1:3hejanzPEBvZSSvjIqayB83/6/6SLLrX9oNZAdiYELg=
-basic.com/valib/gopherdiscovery.git v0.0.0-20190605034340-15d89d8b4e28/go.mod h1:CQ+UJyZV8MRzwwckncdUDu6/RDTKAzSIPCxc9tFcwPs=
basic.com/valib/shm.git v0.0.0-20191029034255-156e610f9bca h1:Y2Lgpxx5Tq0nKSAaB00F4piJhljMgPpfsBGQ2qpEloE=
basic.com/valib/shm.git v0.0.0-20191029034255-156e610f9bca/go.mod h1:yYRM7bM9y0KKd4IfNt3myjsvkFVFIIWNjsvK14tNbq4=
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/ajg/form v1.5.1 h1:t9c7v8JUKu/XxOGBU0yjNpaMloxGEJhUkqFRq0ibGeU=
-github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -45,9 +37,8 @@
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628=
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 h1:efeOvDhwQ29Dj3SdAV/MJf8oukgn+8D8WgaCaRMchF8=
-golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
--
Gitblit v1.8.0