From e29fa980a6ec4bb1e21d87b897eece0764d5f3c0 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 05 七月 2019 10:57:57 +0800
Subject: [PATCH] 把部分fmt改为logger
---
ruleserver/ruleToformula.go | 1 -
main.go | 33 ++++++++++++++++-----------------
2 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/main.go b/main.go
index 9ffe981..6541dc1 100644
--- a/main.go
+++ b/main.go
@@ -7,7 +7,6 @@
"bufio"
"bytes"
"flag"
- "fmt"
"github.com/golang/protobuf/proto"
"gocv.io/x/gocv"
"image"
@@ -41,7 +40,7 @@
dbapi.Init(*dbIp,*dbPort)
go cache.Init(initchan,*dbIp,*surveyPort,*pubPort)
- fmt.Println("cache init completed!!!",<- initchan)//dbserver鍒濆鍖栧畬姣�
+ logger.Info("cache init completed!!!",<- initchan)//dbserver鍒濆鍖栧畬姣�
go ruleserver.TimeTicker()
nReciever("ipc:///tmp/sdk-2-rules-process.ipc", deliver.PushPull, 1)
@@ -69,16 +68,16 @@
default:
msg, err = c.Recv()
if err != nil {
- fmt.Println("recv error : ", err)
+ logger.Info("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)
@@ -101,7 +100,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))
}
}()
@@ -143,7 +142,7 @@
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("------褰撳墠绠楁硶name",sdkinfo.SdkName,"--------------鐪嬬湅yolo涓湁鍑犱釜鐩爣锛�",len(yoloParam.Infos))
@@ -180,7 +179,7 @@
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("------褰撳墠绠楁硶name",sdkinfo.SdkName,"--------------鐪嬬湅浜鸿劯妫�娴嬩腑鏈夊嚑涓洰鏍囷細",len(faceParam.Faces))
@@ -214,14 +213,14 @@
faceParam := protomsg.ParamFaceFeature{}
err = proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
if err != nil {
- fmt.Println("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ logger.Info("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
continue
}
for _,faceExtCom := range faceParam.ExtComp {
binfos := protomsg.Binfos{}
err := proto.Unmarshal(faceExtCom.Comp, &binfos)
if err != nil {
- fmt.Println("瑙ｆ瀽浜鸿劯姣斿鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ logger.Info("瑙ｆ瀽浜鸿劯姣斿鏁版嵁鏃跺嚭鐜伴敊璇�", err)
continue
}
logger.Info("_________________________________________________________________瑙ｆ瀽鍑虹殑浜鸿劯鐨勭浉浼肩殑搴曞簱鏁版嵁",binfos)
@@ -231,7 +230,7 @@
baseinfos := protomsg.Binfos{}
err1 := proto.Unmarshal(extComp.Comp, &baseinfos)
if err1 != nil {
- fmt.Println("瑙ｆ瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+ logger.Info("瑙ｆ瀽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}
@@ -253,7 +252,7 @@
//imgs := gocv.NewMat()
ddd, err := RetrieveROM("./105.jpg")
if err != nil {
- fmt.Println("瑙ｇ爜鏈夎",err)
+ logger.Info("瑙ｇ爜鏈夎",err)
}
bbb := bytes.NewBuffer(ddd) // 蹇呴』鍔犱竴涓猙uffer 涓嶇劧娌℃湁read鏂规硶灏变細鎶ラ敊
rook, _ := gocv.NewMatFromBytes(500, 500, gocv.MatTypeCV8UC3, bbb.Bytes())
@@ -298,11 +297,11 @@
// msg := "涓婁紶鍥剧墖鏈嶅姟鍣ㄥ紓甯�"
// if _, ok := r.(error); ok {
// msg = r.(error).Error()
- // fmt.Println("panic--recover()寰楀埌鐨勬槸error绫诲瀷")
+ // logger.Info("panic--recover()寰楀埌鐨勬槸error绫诲瀷")
// }
// if _, ok := r.(string); ok {
// msg = r.(string)
- // fmt.Println("panic--recover()寰楀埌鐨勬槸string绫诲瀷")
+ // logger.Info("panic--recover()寰楀埌鐨勬槸string绫诲瀷")
// }
// err0 = errors.New(msg)
// }
@@ -314,9 +313,9 @@
// if err != nil {
// logger.Fatal(err)
// }
- // fmt.Println(resp.StatusCode)
- // //fmt.Println(resp.Header)
- // fmt.Println(body)
+ // logger.Info(resp.StatusCode)
+ // //logger.Info(resp.Header)
+ // logger.Info(body)
// //decoder := json.NewDecoder(strings.NewReader(body.String()))
// decoder := make(map[string]interface{})
// if err := json.Unmarshal([]byte(body.String()), &decoder); err != nil {
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index f1fa19a..cdd9447 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -2,7 +2,6 @@
import (
"encoding/json"
- "fmt"
"ruleprocess/cache"
"ruleprocess/logger"
"sort"
--
Gitblit v1.8.0