From 6d0a2b62a05d146440b425598201d52a56b8c911 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期二, 02 七月 2019 13:16:57 +0800
Subject: [PATCH] use camera and localconfig cache
---
insertdata/insertDataToEs.go | 7 ++++---
cache/cache.go | 13 +++++++------
2 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/cache/cache.go b/cache/cache.go
index 70af5aa..2071d96 100644
--- a/cache/cache.go
+++ b/cache/cache.go
@@ -5,6 +5,7 @@
"basic.com/pubsub/cache.git/shardmap"
"basic.com/pubsub/protomsg.git"
"basic.com/valib/gopherdiscovery.git"
+ "errors"
"fmt"
"github.com/gogo/protobuf/proto"
"github.com/satori/go.uuid"
@@ -126,22 +127,22 @@
}
}
-func GetServerInfo() *protomsg.LocalConfig {
+func GetServerInfo() (con protomsg.LocalConfig,err error) {
config, b := cMap.Get(SERVER_KEY)
if b {
- return config.(*protomsg.LocalConfig)
+ return config.(protomsg.LocalConfig),nil
} else {
- return nil
+ return con,errors.New("conf not found")
}
}
//閫氳繃cameraId鑾峰彇鎽勫儚鏈轰俊鎭�
-func GetCameraById(cameraId string) *protomsg.Camera {
+func GetCameraById(cameraId string) (c protomsg.Camera,err error) {
cam, b := cMap.Get(PREFIX_CAMERA + cameraId)
if b {
- return cam.(*protomsg.Camera)
+ return cam.(protomsg.Camera),nil
} else {
- return nil
+ return c,errors.New("camera not found")
}
}
diff --git a/insertdata/insertDataToEs.go b/insertdata/insertDataToEs.go
index c8319c6..2f0b44f 100644
--- a/insertdata/insertDataToEs.go
+++ b/insertdata/insertDataToEs.go
@@ -6,6 +6,7 @@
"fmt"
"log"
"net"
+ "ruleprocess/cache"
"strings"
"time"
@@ -211,12 +212,12 @@
}
// log.Println("鍥剧墖涓婁紶杩斿洖鍊硷細", resp)
// 鏌ヨ鏈満淇℃伅
- flag, localConfig := dbapi.SysSetApi{}.GetServerInfo()
- if !flag {
+ localConfig, err := cache.GetServerInfo()
+ if err !=nil {
log.Println("鏌ヨ鏈満淇℃伅澶辫触锛�")
}
// 鏌ヨcameraName
- camera, err := dbapi.CameraApi{}.GetCameraById(msg.Cid)
+ camera, err := cache.GetCameraById(msg.Cid)
if err != nil {
log.Println("鏌ヨ鎽勫儚鏈轰俊鎭け璐�")
}
--
Gitblit v1.8.0