From 69a44e03958e215b6d90b89576f79ac445c01355 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 11 七月 2019 11:18:44 +0800
Subject: [PATCH] 更新cache，比对，和定时器
---
main.go | 105 ++++++++++++++++++++++------------------------------
1 files changed, 45 insertions(+), 60 deletions(-)
diff --git a/main.go b/main.go
index 109f41c..7c6019f 100644
--- a/main.go
+++ b/main.go
@@ -1,20 +1,46 @@
package main
import (
- "fmt"
- "ruleprocess/insertdata"
- "ruleprocess/ruleserver"
- "ruleprocess/util"
-
+ "basic.com/dbapi.git"
"basic.com/pubsub/protomsg.git"
"basic.com/valib/deliver.git"
+ //"bufio"
+ //"bytes"
+ "flag"
+ "fmt"
+ "ruleprocess/logger"
"github.com/golang/protobuf/proto"
+ //"gocv.io/x/gocv"
+ //"image"
+ //"image/color"
+ //"os"
+ "ruleprocess/cache"
+ "ruleprocess/ruleserver"
+ "ruleprocess/util"
+ "ruleprocess/insertdata"
"sync"
)
+var dbIp = flag.String("dbIp","127.0.0.1","dbserver ip")
+var dbPort = flag.Int("dbPort",8001,"default dbPort=8001")
+var surveyPort = flag.Int("surveyPort",40007,"survey port") //蹇冭烦
+var pubPort = flag.Int("pubPort",50007,"pubsub port") //鏁版嵁鏇存柊
+var initchan = make(chan bool)
+func init () {
+ // 鏃ュ織鍒濆鍖�
+ logger.Config("./info.log", logger.DebugLevel)
+ logger.Info("鏃ュ織鍒濆鍖栨垚鍔燂紒")
+}
func main() {
+ flag.Parse()
wg := sync.WaitGroup{}
- wg.Add(1)
+ wg.Add(2)
+
+ dbapi.Init(*dbIp,*dbPort)
+ go cache.Init(initchan,*dbIp,*surveyPort,*pubPort)
+ logger.Info("cache init completed!!!",<- initchan)//dbserver鍒濆鍖栧畬姣�
+ //fmt.Println("缂撳瓨鍒濆鍖栧畬鎴�",<- initchan)//dbserver鍒濆鍖栧畬姣�
+
go ruleserver.TimeTicker()
nReciever("ipc:///tmp/sdk-2-rules-process.ipc", deliver.PushPull, 1)
wg.Wait()
@@ -36,16 +62,17 @@
default:
msg, err = c.Recv()
if err != nil {
+ logger.Info("recv error : ", err)
fmt.Println("recv error : ", err)
continue
} else {
arg := ruleserver.SdkDatas{}
m := paramFormat(msg, &arg)
- fmt.Println("瑙ｆ瀽鍑烘潵鐨勬暟鎹細", arg)
+ //logger.Info("瑙ｆ瀽鍑烘潵鐨勬暟鎹細", arg)
ruleserver.Judge(&arg)
// 鎶奱rg閲岀殑鎵撶殑鏍囩鎷垮嚭鏉ョ粰m鍐嶅皝瑁呬竴灞�
resultMag := ruleserver.ResultMsg{SdkMessage: m, RuleResult: arg.RuleResult}
- //fmt.Println("鎵撳畬鏍囩鍚庣殑缁撴灉锛�",resultMag)
+ //logger.Info("鎵撳畬鏍囩鍚庣殑缁撴灉锛�",resultMag)
// 灏嗘墦瀹屾爣绛剧殑鏁版嵁鎻掑叆鍒癊S
insertdata.InsertToEs(resultMag)
@@ -68,7 +95,7 @@
func paramFormat(msg []byte, args *ruleserver.SdkDatas) protomsg.SdkMessage {
defer func() {
if err := recover(); err != nil {
- fmt.Println("瑙ｅ寘杩囩▼鐨勯敊璇�", err.(string))
+ logger.Info("瑙ｅ寘杩囩▼鐨勯敊璇�", err.(string))
}
}()
@@ -86,13 +113,12 @@
}
i := protomsg.Image{}
err = proto.Unmarshal(bdata, &i)
-
+ //logger.Info("----------------鐪嬬湅鏈夊嚑涓畻娉曪細",len(m.Tasklab.Sdkinfos))
for _, sdkinfo := range m.Tasklab.Sdkinfos { // yolo绠楁硶
if sdkinfo.Sdktype == "Yolo" {
arg := ruleserver.SdkData{}
arg.TaskId = m.Tasklab.Taskid
- arg.SdkId = sdkinfo.Sdkid
- arg.SdkName = sdkinfo.SdkName
+ arg.IpcId = sdkinfo.Ipcid
arg.IsYolo = true
bdata, err := util.UnCompress(m.Data)
if err != nil {
@@ -107,13 +133,13 @@
arg.IsStatic = false
if len(sdkinfo.Sdkdata) > 1 {
// 澶т簬1鎵嶆湁鏁版嵁
- fmt.Println("----------------------------------------------------",m.Cid)
yoloParam := protomsg.ParamYoloObj{}
err = proto.Unmarshal(sdkinfo.Sdkdata, &yoloParam)
if err != nil {
- fmt.Println("瑙ｆ瀽YOLO sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ logger.Info("瑙ｆ瀽YOLO sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
continue
}
+ //logger.Info("--------------鐪嬬湅yolo涓湁鍑犱釜鐩爣锛�",len(yoloParam.Infos))
for _, info := range yoloParam.Infos {
if info.Typ == 0 {
photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.RcObj), Score: float64(info.Prob)*100,IsYolo:true}
@@ -129,8 +155,7 @@
if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
arg := ruleserver.SdkData{}
arg.TaskId = m.Tasklab.Taskid
- arg.SdkId = sdkinfo.Sdkid
- arg.SdkName = sdkinfo.SdkName
+ arg.IpcId = sdkinfo.Ipcid
arg.IsYolo = false
bdata, err := util.UnCompress(m.Data)
if err != nil {
@@ -144,15 +169,16 @@
arg.KeepRight = false
arg.IsStatic = false
if len(sdkinfo.Sdkdata) > 1 {
- fmt.Println("----------------------------------------------------",m.Caddr)
faceParam := protomsg.ParamFacePos{}
err = proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
if err != nil {
- fmt.Println("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ logger.Info("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
continue
}
+ logger.Info("--------------鐪嬬湅浜鸿劯妫�娴嬩腑鏈夊嚑涓洰鏍囷細",len(faceParam.Faces))
for _, info := range faceParam.Faces {
- photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.Pos.RcFace), Score: float64(info.Pos.Quality)*100, IsYolo:false,ThftRes:*(info.Result)}
+ logger.Info("_______________________________________________绗竴娆＄湅鐩镐技鍊硷細",info.Pos.FAngle.Confidence*100)
+ photoMap := ruleserver.PhotoMap{Rects: rectFormat(info.Pos.RcFace), Score: float64(info.Pos.FAngle.Confidence*100), IsYolo:false,ThftRes:*(info.Result),Feature:info.Feats}
arg.Photo = append(arg.Photo, photoMap)
}
args.Sdkdata = append(args.Sdkdata,&arg)
@@ -160,47 +186,6 @@
continue
}
}
- if sdkinfo.Sdktype == "FaceExtract" { // 浜鸿劯鎻愬彇
- arg := ruleserver.SdkData{}
- arg.TaskId = m.Tasklab.Taskid
- arg.SdkId = sdkinfo.Sdkid
- arg.SdkName = sdkinfo.SdkName
- arg.IsYolo = false
- bdata, err := util.UnCompress(m.Data)
- if err != nil {
- panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
- }
- i := protomsg.Image{}
- err = proto.Unmarshal(bdata, &i)
- arg.ImageWidth = int(i.Width)
- arg.ImageHeight = int(i.Height)
- // 鏆傛椂鍐欐锛宻dk杩樻病鏈夎繖淇╃畻娉�
- arg.KeepRight = false
- arg.IsStatic = false
- if len(sdkinfo.Sdkdata) > 1 {
- fmt.Println("----------------------------------------------------",m.Caddr)
- faceParam := protomsg.ParamFaceFeature{}
- err = proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
- if err != nil {
- fmt.Println("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
- continue
- }
- for _, extComp := range faceParam.ExtComp {
- baseinfos := protomsg.Binfos{}
- err1 := proto.Unmarshal(extComp.Comp, &baseinfos)
- if err1 != nil {
- fmt.Println("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
- continue
- }
- photoMap := ruleserver.PhotoMap{Rects: rectFormat(extComp.Pos.Pos.RcFace), Score: float64(extComp.Pos.Pos.Quality)*100, IsYolo:false,ThftRes:*(extComp.Pos.Result),Liker:baseinfos.Infos}
- arg.Photo = append(arg.Photo, photoMap)
- }
- args.Sdkdata = append(args.Sdkdata,&arg)
- } else {
- continue
- }
- }
-
}
return m
}
\ No newline at end of file
--
Gitblit v1.8.0