From bc089cb02e4dce65539ba8989ce720935d39cdb6 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 05 七月 2019 17:43:09 +0800
Subject: [PATCH] ---
---
cache/cache.go | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/cache/cache.go b/cache/cache.go
index 70af5aa..b0578cf 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"
@@ -61,10 +62,16 @@
return
}
switch newUpdateMsg.Table {
+ case protomsg.TableChanged_T_Server:
+ initServerInfo()
+ case protomsg.TableChanged_T_Camera:
+ initCamera()
case protomsg.TableChanged_T_CameraPolygon://鏇存柊鎽勫儚鏈哄鍙樺舰
initPolygons()
case protomsg.TableChanged_T_TimeRule://鏇存柊鏃堕棿瑙勫垯
initTimeRules()
+ case protomsg.TableChanged_T_CameraTask://鏇存柊鎽勫儚鏈鸿鍒欓厤缃弬鏁�
+ initCameraTaskRules()
case protomsg.TableChanged_T_CameraTaskArgs://鏇存柊鎽勫儚鏈鸿鍒欓厤缃弬鏁�
initCameraTaskRules()
default:
@@ -126,22 +133,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")
}
}
--
Gitblit v1.8.0