From 5d3d27588e93e0c6e8842ee79c843b9989873166 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 27 九月 2019 14:45:13 +0800
Subject: [PATCH] logger改用公共库
---
ruleserver/readyDataForRule.go | 65 ++++++++++++--------------------
1 files changed, 25 insertions(+), 40 deletions(-)
diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go
index a641688..bc5e59d 100644
--- a/ruleserver/readyDataForRule.go
+++ b/ruleserver/readyDataForRule.go
@@ -2,21 +2,18 @@
import (
"basic.com/dbapi.git"
- bigCache "basic.com/pubsub/cache.git"
"basic.com/pubsub/protomsg.git"
"encoding/json"
"errors"
"fmt"
- "github.com/go-yaml/yaml"
"github.com/golang/protobuf/proto"
- "io/ioutil"
"math"
"nanomsg.org/go-mangos"
"nanomsg.org/go-mangos/protocol/req"
"nanomsg.org/go-mangos/transport/tcp"
"net"
"ruleprocess/cache"
- "ruleprocess/logger"
+ "basic.com/valib/logger.git"
"strconv"
"time"
)
@@ -33,25 +30,9 @@
}
func Init() {
- data, err := ioutil.ReadFile("./config/conf.yml")
- if err != nil {
- fmt.Println("璇诲彇閰嶇疆鏂囦欢鍑洪敊--", err)
- logger.Error("璇诲彇閰嶇疆鏂囦欢鍑洪敊--", err)
- }
- c := conf{}
- //鎶妝aml褰㈠紡鐨勫瓧绗︿覆瑙ｆ瀽鎴恠truct绫诲瀷
- yaml.Unmarshal(data, &c)
- logger.Debug("閰嶇疆鏂囦欢鐨勫�间负锛�", c)
- serverIp = c.ServerIp
- serverPort = c.ServerPort
- dbTablePersons = c.DbTablePersons
- localConfig, err1 := cache.GetServerInfo()
- if err1 != nil {
- logger.Error("鏌ヨ鏈満淇℃伅澶辫触锛�")
- }
- logger.Debug("鏈満淇℃伅鍜宻erver淇℃伅锛�", localConfig, serverIp, serverPort)
- bigCache.Init(dbTablePersons, serverIp, serverPort, localConfig.ServerId)
- Push1()
+ //logger.Debug("鏈満淇℃伅鍜宻erver淇℃伅锛�", localConfig, serverIp, serverPort)
+ //bigCache.Init(dbTablePersons, serverIp, serverPort, localConfig.ServerId)
+ go Push1()
}
var sender chan *protomsg.CompareArgs = make(chan *protomsg.CompareArgs)
@@ -82,17 +63,21 @@
}
}
logger.Debug("褰撳墠鏁版嵁甯ц鍖归厤鐨勮鍒欑粍锛�-------------------------","鎽勫儚鏈篿d:",cameraId,"浠诲姟id",taskId)
- for _,ruleGroup := range taskGroup.GroupRules{
- logger.Info(ruleGroup.GroupText)
+ if taskGroup == nil {
+ return nil
+ } else {
+ for _,ruleGroup := range taskGroup.GroupRules{
+ logger.Info(ruleGroup.GroupText)
+ }
+ return taskGroup
}
- return taskGroup
}
// 鏍规嵁鎽勫儚鏈篿d鎷垮埌鎽勫儚鏈烘墍鏈夊尯鍩�
func GetPolygons(cameraId string) []protomsg.CameraPolygon {
var cameraPolygons []protomsg.CameraPolygon
cameraPolygons = cache.GetPolygonsByCameraId(cameraId)
- //logger.Debug("------=======鏌ョ湅涓嬪叏閮ㄥ尯鍩燂細",cameraPolygons)
+ logger.Debug("------=======鏌ョ湅涓嬪叏閮ㄥ尯鍩燂細",cameraPolygons)
return cameraPolygons
}
@@ -234,7 +219,7 @@
if groupRule.Rules[j].SdkArgAlias == "compareBase" && groupRule.Rules[j].SdkArgValue == "" { // 閰嶇殑鍙傛暟鏄瘮瀵瑰叏閮ㄥ簳搴�
compareFlag = 1
}
- if groupRule.Rules[j].SdkArgAlias == "threshold" {
+ if groupRule.Rules[j].SdkArgAlias == "cmpThreshold" {
v2, err := strconv.ParseFloat(groupRule.Rules[j].SdkArgValue, 32)
if err != nil {
logger.Error("string杞琭loat32澶辫触锛�")
@@ -261,14 +246,14 @@
//logger.Info("--------------鐪嬬湅compareFlag鐨勫�煎拰tableId鍜宎reaMap.args鐨勯暱搴︼細",compareFlag,tableIds,len(areaMap.args))
for _, arg := range areaMap.args {
arg.Liker = arg.Liker[0:0]
- logger.Info("娓呯┖涔嬪悗鐪嬬湅涔嬪墠鎵撶殑浜鸿劯鏍囩鍙樹簡娌★細")
- if args.RuleResult["face"] != nil && len(args.RuleResult["face"].([]FaceResult)) > 0 {
- for _, faceResult := range args.RuleResult["face"].([]FaceResult) {
- for _,arg := range faceResult.Args {
- logger.Info("浜哄憳鍒嗗�兼槸锛�",arg.Score,"liker鐨勬暟閲忎负",arg.Liker)
- }
- }
- }
+ //logger.Info("娓呯┖涔嬪悗鐪嬬湅涔嬪墠鎵撶殑浜鸿劯鏍囩鍙樹簡娌★細")
+ //if args.RuleResult["face"] != nil && len(args.RuleResult["face"].([]FaceResult)) > 0 {
+ // for _, faceResult := range args.RuleResult["face"].([]FaceResult) {
+ // for _,arg := range faceResult.Args {
+ // logger.Info("浜哄憳鍒嗗�兼槸锛�",arg.Score,"liker鐨勬暟閲忎负",arg.Liker)
+ // }
+ // }
+ //}
if compareFlag == 1 {
arg.fillLiker(nil, threshold)
}
@@ -293,7 +278,7 @@
func (a *AreaMap) CountAreaObjs(arg *SdkData) {
a.targetNum = 0
- threshold := 0.0 // 鐩镐技搴�
+ threshold := 80.0 // 鐩镐技搴�
intersectionper := 0.2 // 鍗犳瘮
size := 0.0 // 灏哄
@@ -386,13 +371,12 @@
if errSize != nil {
logger.Error("Failed set MaxRecvSize: %v", err)
}
+ //sock.AddTransport(ipc.NewTransport())
+ sock.AddTransport(tcp.NewTransport())
serverIP, _ := GetLocalIP()
if err = sock.Dial("tcp://"+serverIP+":4010"); err != nil {
logger.Error("璇锋眰socket鎷ㄥ彿澶辫触: %s", err.Error())
}
- //sock.AddTransport(ipc.NewTransport())
- sock.AddTransport(tcp.NewTransport())
-
logger.Info("搴忓垪鍖栨暟鎹�")
for {
@@ -400,6 +384,7 @@
// case <-ctx.Done():
// return
case data := <- sender:
+ logger.Info("姣斿杩涚▼鍏ュ弬锛�",data.TableIds,data.CompareThreshold)
bytes,err1 := proto.Marshal(data)
logger.Info("鏁版嵁闀垮害涓猴細",len(bytes))
if err1 != nil {
--
Gitblit v1.8.0