From 6e707d6f72c2503d7231820acf90adec6e03b8f3 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 24 十月 2019 11:54:27 +0800
Subject: [PATCH] 减少日志量外加放开标签过滤器
---
main.go | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/main.go b/main.go
index fa28b33..bd3bb40 100644
--- a/main.go
+++ b/main.go
@@ -7,6 +7,8 @@
"net/http"
_ "net/http/pprof"
"ruleprocess/insertdata"
+ "ruleprocess/labelFilter"
+ "ruleprocess/logger"
"ruleprocess/structure"
"ruleprocess/util"
"time"
@@ -16,7 +18,7 @@
"flag"
"fmt"
"github.com/golang/protobuf/proto"
- "basic.com/valib/logger.git"
+ "github.com/spf13/viper"
//"gocv.io/x/gocv"
//"image"
//"image/color"
@@ -24,7 +26,6 @@
"ruleprocess/cache"
"ruleprocess/ruleserver"
"sync"
- "github.com/spf13/viper"
)
var dbIp = flag.String("dbIp", "127.0.0.1", "dbserver ip")
@@ -91,7 +92,7 @@
} else {
//runtime.GOMAXPROCS(runtime.NumCPU())
//logger.Debug("浣跨敤鐨刢pu涓暟锛�",runtime.NumCPU())
- //go func(msg []byte) {
+ go func(msg []byte) {
logger.Debug("褰撳墠鏃堕棿鎴筹細", time.Now().Unix())
arg := structure.SdkDatas{}
//paramFormat(msg, &arg)
@@ -106,8 +107,9 @@
insertdata.InsertToEs(resultMsg)
logger.Debug("鎻掑叆瀹孍s鎵�鐢ㄦ椂闂达細", time.Since(start))
//浜嬩欢鎺ㄩ��
- //go labelFilter.Judge(resultMsg)
- //}(msg)
+ go labelFilter.Judge(resultMsg)
+ //logger.OutPutByPanlei()
+ }(msg)
}
}
}
@@ -117,7 +119,7 @@
// 灏嗗閮ㄤ紶杩涙潵鐨剅ect锛坱op,bottom,left,right锛夎浆鍖栦负鑷繁鍐呴儴鐨剅ect(left top width height)
func rectFormat(rcobj *protomsg.Rect) structure.Rect {
//logger.Info("++++++++++++++++++++++++++++++鏀跺埌鐨剏olo鐨勫尯鍩熷潗鏍囷細",rcobj)
- rect := ruleserver.Rect{}
+ rect := structure.Rect{}
rect.X = float64(rcobj.Left)
rect.Y = float64(rcobj.Top)
rect.Width = float64(rcobj.Right - rcobj.Left)
@@ -183,7 +185,7 @@
for _, info := range yoloParam.Infos {
if info.Typ == 0 {
//logger.Debug("-------------yolo鐨勫潗鏍囨湁鍑犱釜",info.RcObj)
- photoMap := structure.PhotoMap{Rects: rectFormat(info.RcObj), Score: float64(info.Prob) * 100, IsYolo: true}
+ photoMap := structure.PhotoMap{Rects: rectFormat(info.RcObj), Score: float64(info.Prob) * 100, IsYolo: true,Id:info.ObjID}
arg.Photo = append(arg.Photo, photoMap)
yoloNum++
}
--
Gitblit v1.8.0