From 371eec6fc2618458e037affaf646ff83e6887e63 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期六, 30 十一月 2019 15:44:59 +0800
Subject: [PATCH] 再削减日志
---
main.go | 181 ++++++++++-----------------------------------
1 files changed, 40 insertions(+), 141 deletions(-)
diff --git a/main.go b/main.go
index 360d176..f8a44a5 100644
--- a/main.go
+++ b/main.go
@@ -6,17 +6,15 @@
"basic.com/valib/deliver.git"
"net/http"
_ "net/http/pprof"
+ "plugin"
"ruleprocess/insertdata"
"ruleprocess/labelFilter"
"ruleprocess/structure"
- "ruleprocess/util"
- "time"
-
- "basic.com/valib/logger.git"
+ //"basic.com/valib/logger.git"
"flag"
"fmt"
- "github.com/golang/protobuf/proto"
- "github.com/spf13/viper"
+ //"github.com/spf13/viper"
+ logger "github.com/alecthomas/log4go"
"ruleprocess/cache"
"ruleprocess/ruleserver"
"sync"
@@ -34,15 +32,18 @@
// 鏃ュ織鍒濆鍖�
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)
+ //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)
+ // log4go
+ logger.LoadConfiguration("./logger/log.xml")
logger.Info("鏃ュ織鍒濆鍖栨垚鍔燂紒")
+
}
func main() {
//fmt.Println("缂撳瓨鍒濆鍖栧畬鎴�",<- initchan)//dbserver鍒濆鍖栧畬姣�
@@ -60,6 +61,8 @@
labelFilter.Init()
go ruleserver.TimeTicker()
go ruleserver.StartServer()
+ //timeEle := ruleserver.TimeElement{N: 300, InitN: 300}
+ //ruleserver.TimeEleList["ruleprocess"] = &timeEle
nReciever("ipc:///tmp/sdk-2-rules-process.ipc", deliver.PushPull, 1)
wg.Wait()
}
@@ -81,153 +84,49 @@
msg, err = c.Recv()
//msgChan <- msg
if err != nil {
- logger.Info("recv error : ", err)
+ //logger.Info("recv error : ", err)
fmt.Println("recv error : ", err)
continue
} else {
- //runtime.GOMAXPROCS(runtime.NumCPU())
- //logger.Debug("浣跨敤鐨刢pu涓暟锛�",runtime.NumCPU())
- go func(msg []byte) {
- logger.Debug("褰撳墠鏃堕棿鎴筹細", time.Now().Unix())
+
+ //go func(msg []byte) {
+ //logger.Debug("褰撳墠鏃堕棿鎴筹細", time.Now().Unix())
+ //logger.Warn(time.Now().Format("2006-01-02 15:04:05"))
arg := structure.SdkDatas{}
//paramFormat(msg, &arg)
- start := time.Now()
- m := paramFormat(msg, &arg)
+ //start := time.Now()
+ m := CallParamFormat(msg, &arg)
// 杩涜瑙勫垯澶勭悊鍒ゆ柇(鎵撲笂瑙勫垯鐨勬爣绛�)
ruleserver.Judge(&arg, &m) // 鎶妔dkMessage浼犺繘鍘伙紝鏂逛究缂撳瓨鏁版嵁鏃舵嫾鍑轰竴涓猺esultMag
// 鎶奱rg閲岀殑鎵撶殑鏍囩鎷垮嚭鏉ョ粰m鍐嶅皝瑁呬竴灞�
resultMsg := structure.ResultMsg{SdkMessage: &m, RuleResult: arg.RuleResult}
ruleserver.GetAttachInfo(resultMsg.SdkMessage)
- ruleEnd := time.Since(start)
- logger.Debug("瑙勫垯鍒ゆ柇瀹屾墍鐢ㄦ椂闂达細", ruleEnd)
+ //ruleEnd := time.Since(start)
+ //logger.Debug("瑙勫垯鍒ゆ柇瀹屾墍鐢ㄦ椂闂达細", ruleEnd)
// 灏嗘墦瀹屾爣绛剧殑鏁版嵁鎻掑叆鍒癊S
insertdata.InsertToEs(resultMsg)
- esEnd := time.Since(start)
- logger.Debug("鎻掑叆瀹孍s鎵�鐢ㄦ椂闂达細", esEnd)
+ //esEnd := time.Since(start)
+ //logger.Debug("鎻掑叆瀹孍s鎵�鐢ㄦ椂闂达細", esEnd)
//浜嬩欢鎺ㄩ��
labelFilter.PushSomthing(resultMsg)
- }(msg)
+ //}(msg)
}
}
}
}
-
-// 灏嗗閮ㄤ紶杩涙潵鐨剅ect锛坱op,bottom,left,right锛夎浆鍖栦负鑷繁鍐呴儴鐨剅ect(left top width height)
-func rectFormat(rcobj *protomsg.Rect) structure.Rect {
- //logger.Info("++++++++++++++++++++++++++++++鏀跺埌鐨剏olo鐨勫尯鍩熷潗鏍囷細",rcobj)
- rect := structure.Rect{}
- rect.X = float64(rcobj.Left)
- rect.Y = float64(rcobj.Top)
- rect.Width = float64(rcobj.Right - rcobj.Left)
- rect.Height = float64(rcobj.Bottom - rcobj.Top)
- return rect
-}
-
-// 灏嗗閮ㄤ紶杩涙潵鐨剆dk鏁版嵁鍖呰В鎴� SdkDatas
-func paramFormat(msg []byte, args *structure.SdkDatas) protomsg.SdkMessage {
- defer func() {
- if err := recover(); err != nil {
- logger.Info("瑙ｅ寘杩囩▼鐨勫紓甯告崟鑾�", err.(string))
- }
-
- }()
- // 鍙嶅簭鍒楀寲鏁版嵁寰楀埌sdk鍏ュ弬
- m := protomsg.SdkMessage{}
- err := proto.Unmarshal(msg, &m)
+func CallParamFormat(msg []byte, args *structure.SdkDatas) protomsg.SdkMessage{
+ //logger.Info("鍛煎彨涓棿浠舵牸寮忓寲鏁版嵁")
+ p,err := plugin.Open("./algorithm/middleware.so")
if err != nil {
- panic("瑙ｆ瀽msg鏃跺嚭鐜伴敊璇�")
+ panic(err)
}
-
- // 鍏堣繘琛屼竴涓嬭拷韪�
- ruleserver.FaceIsSame(&m)
- args.CameraId = m.Cid
- args.TaskId = m.Tasklab.Taskid
- // 鎶婂浘鐗囩殑浜岃繘鍒惰В鍘嬬缉杩涜鐢绘鍦ㄥ帇缂╁洖鍘�
- bdata, err := util.UnCompress(m.Data)
- if err != nil {
- panic("瑙ｅ帇缂╁浘鐗囨椂鍑虹幇閿欒")
+ f,err1 := p.Lookup("ParamFormat")
+ if err1 != nil {
+ panic("娌℃湁鎵惧埌涓棿浠剁殑鏍煎紡鍖栨暟鎹嚱鏁�")
}
- i := protomsg.Image{}
- err = proto.Unmarshal(bdata, &i)
- logger.Info("鎺ュ埌鏁版嵁锛屾憚鍍忔満涓猴細", m.Cid, "鍥剧墖鐨刬d涓猴細", i.Id)
- //logger.Info("----------------鐪嬬湅鏈夊嚑涓畻娉曪細",len(m.Tasklab.Sdkinfos))
- for _, sdkinfo := range m.Tasklab.Sdkinfos { // yolo绠楁硶
- if sdkinfo.Sdktype == "Yolo" {
- arg := structure.SdkData{}
- arg.TaskId = m.Tasklab.Taskid
- arg.IpcId = sdkinfo.Ipcid
- arg.IsYolo = true
- //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
- logger.Info("-----杩借釜涔嬪悗sdkinfo.Sdkdata鐨勯暱搴︿负锛�----", len(sdkinfo.Sdkdata))
- if len(sdkinfo.Sdkdata) > 1 {
- // 澶т簬1鎵嶆湁鏁版嵁
- yoloParam := protomsg.ParamYoloObj{}
- err = proto.Unmarshal(sdkinfo.Sdkdata, &yoloParam)
- if err != nil {
- logger.Info("瑙ｆ瀽YOLO sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
- continue
- }
- var yoloNum int = 0
- 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,Id:info.ObjID}
- arg.Photo = append(arg.Photo, photoMap)
- yoloNum++
- }
- }
- logger.Info("--------------杩借釜涔嬪悗yolo鐨勪釜鏁帮細", yoloNum)
- args.Sdkdata = append(args.Sdkdata, &arg)
- } else {
- continue
- }
-
- }
- if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
- arg := structure.SdkData{}
- arg.TaskId = m.Tasklab.Taskid
- arg.IpcId = sdkinfo.Ipcid
- 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 {
- faceParam := protomsg.ParamFacePos{}
- err = proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
- if err != nil {
- logger.Info("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
- continue
- }
- logger.Info("--------------杩借釜涔嬪悗浜鸿劯鐨勪釜鏁帮細", len(faceParam.Faces))
- for _, info := range faceParam.Faces {
- //logger.Info("_______________________________________________绗竴娆＄湅鐩镐技鍊硷細",info.Pos.FAngle.Confidence*100)
- photoMap := structure.PhotoMap{Id: info.Pos.FaceID, 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)
- } else {
- continue
- }
- }
- }
- return m
+ mess := f.(func(msg []byte, args *structure.SdkDatas)(protomsg.SdkMessage))(msg,args)
+ return mess
}
+
+// 5鍒嗛挓鏀朵笉鍒版秷鎭潃姝昏嚜宸遍噸鍚�
--
Gitblit v1.8.0