From 5ae97eebd0dfcaad32e92f9df7b7f73caad922bf Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 07 十一月 2019 18:20:43 +0800
Subject: [PATCH] merge module
---
main.go | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/main.go b/main.go
index a8adc1a..32fa0e0 100644
--- a/main.go
+++ b/main.go
@@ -7,20 +7,16 @@
"net/http"
_ "net/http/pprof"
"ruleprocess/insertdata"
+ "ruleprocess/labelFilter"
"ruleprocess/structure"
"ruleprocess/util"
"time"
- //"bufio"
- //"bytes"
+ "basic.com/valib/logger.git"
"flag"
"fmt"
"github.com/golang/protobuf/proto"
- "ruleprocess/logger"
- //"gocv.io/x/gocv"
- //"image"
- //"image/color"
- //"os"
+ "github.com/spf13/viper"
"ruleprocess/cache"
"ruleprocess/ruleserver"
"sync"
@@ -31,12 +27,22 @@
var surveyPort = flag.Int("surveyPort", 40007, "survey port") //蹇冭烦
var pubPort = flag.Int("pubPort", 50007, "pubsub port") //鏁版嵁鏇存柊
var initchan = make(chan bool)
+var env = flag.String("env","pro","env set")
func init() {
+ flag.Parse()
// 鏃ュ織鍒濆鍖�
- logger.Config("./info.log", logger.DebugLevel)
- logger.Info("鏃ュ織鍒濆鍖栨垚鍔燂紒")
+ insertdata.Init(*env)
+ var logFile = "./logger/"
+ if viper.GetString("LogBasePath") != "" {
+ logFile = viper.GetString("LogBasePath")
+ }
+ logFile = logFile + "ruleprocess.log"
+ fmt.Println("鏃ュ織鍦板潃锛�",logFile)
+ logger.Config(logFile, logger.DebugLevel)
+ logger.SetSaveDays(7)
+ logger.Info("鏃ュ織鍒濆鍖栨垚鍔燂紒")
}
func main() {
//fmt.Println("缂撳瓨鍒濆鍖栧畬鎴�",<- initchan)//dbserver鍒濆鍖栧畬姣�
@@ -51,6 +57,7 @@
go cache.Init(initchan, *dbIp, *surveyPort, *pubPort)
logger.Info("cache init completed!!!", <-initchan) //dbserver鍒濆鍖栧畬姣�
ruleserver.Init()
+ labelFilter.Init()
go ruleserver.TimeTicker()
go ruleserver.StartServer()
nReciever("ipc:///tmp/sdk-2-rules-process.ipc", deliver.PushPull, 1)
@@ -90,12 +97,15 @@
ruleserver.Judge(&arg, &m) // 鎶妔dkMessage浼犺繘鍘伙紝鏂逛究缂撳瓨鏁版嵁鏃舵嫾鍑轰竴涓猺esultMag
// 鎶奱rg閲岀殑鎵撶殑鏍囩鎷垮嚭鏉ョ粰m鍐嶅皝瑁呬竴灞�
resultMsg := structure.ResultMsg{SdkMessage: &m, RuleResult: arg.RuleResult}
- logger.Debug("瑙勫垯鍒ゆ柇瀹屾墍鐢ㄦ椂闂达細", time.Since(start))
+ ruleserver.GetAttachInfo(resultMsg.SdkMessage)
+ ruleEnd := time.Since(start)
+ logger.Debug("瑙勫垯鍒ゆ柇瀹屾墍鐢ㄦ椂闂达細", ruleEnd)
// 灏嗘墦瀹屾爣绛剧殑鏁版嵁鎻掑叆鍒癊S
insertdata.InsertToEs(resultMsg)
- logger.Debug("鎻掑叆瀹孍s鎵�鐢ㄦ椂闂达細", time.Since(start))
+ esEnd := time.Since(start)
+ logger.Debug("鎻掑叆瀹孍s鎵�鐢ㄦ椂闂达細", esEnd)
//浜嬩欢鎺ㄩ��
- //go labelFilter.Judge(resultMsg)
+ labelFilter.PushSomthing(resultMsg)
//}(msg)
}
}
@@ -118,7 +128,7 @@
func paramFormat(msg []byte, args *structure.SdkDatas) protomsg.SdkMessage {
defer func() {
if err := recover(); err != nil {
- logger.Info("瑙ｅ寘杩囩▼鐨勯敊璇�", err.(string))
+ logger.Info("瑙ｅ寘杩囩▼鐨勫紓甯告崟鑾�", err.(string))
}
}()
@@ -172,7 +182,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