From b5df418bd3a9a332caa1559e96136c149b6f0e44 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期二, 06 八月 2019 13:57:05 +0800
Subject: [PATCH] log
---
controllers/fileController.go | 6 ++++++
service/FaceSdkService.go | 21 ++-------------------
2 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/controllers/fileController.go b/controllers/fileController.go
index 207edab..4640286 100644
--- a/controllers/fileController.go
+++ b/controllers/fileController.go
@@ -599,8 +599,13 @@
}
var weedfsUri = "http://"+config.WeedFs.Ip+":"+strconv.Itoa(config.WeedFs.UploadPort)+"/submit"
//鏍规嵁浜鸿劯鍧愭爣鎵ｅ嚭浜鸿劯灏忓浘
+ t1 := time.Now()
cutFaceImgData := util.SubImg(*pI, int(rcFace.Left), int(rcFace.Top), int(rcFace.Right), int(rcFace.Bottom))
+ logger.Debug("SubImg鐢ㄦ椂锛�", time.Since(t1))
+ t1 = time.Now()
fileInfo, e := esutil.PostFormData(weedfsUri, filename, "file", cutFaceImgData)
+ logger.Debug("涓婁紶鍒皐eedfs鐢ㄦ椂:", time.Since(t1))
+ t1 = time.Now()
if e != nil {
fmt.Println(e.Error())
return "", nil, e
@@ -624,6 +629,7 @@
dbperson.FaceFeature = faceBase64 // 鐗瑰緛鍊糱ase64 鐮�
result := addDbPerson(dbperson)
+ logger.Debug("addDbPerson鐢ㄦ椂锛�", time.Since(t1))
return fileNameOnly, result, nil
}
diff --git a/service/FaceSdkService.go b/service/FaceSdkService.go
index 5cfa375..148375f 100644
--- a/service/FaceSdkService.go
+++ b/service/FaceSdkService.go
@@ -34,25 +34,19 @@
)
func GetFaceFeaFromSdk(fileBytes []byte,deadTime time.Duration) ([]*protomsg.ResultFaceDetect,error,*protomsg.Image){
- tStart :=time.Now()
s := NewFaceSdkService(fileBytes, deadTime)
i, err := s.ReadFromUploadImg()
- logger.Debug("ReadFromUploadImg鐢ㄦ椂锛�", time.Since(tStart))
if err !=nil{
logger.Debug("readFromUploadImg err:",err)
return nil,err,i
}
- tStart = time.Now()
bc, err := ImgCompress(i)
- logger.Debug("ImgCompress鐢ㄦ椂锛�", time.Since(tStart))
if err !=nil {
logger.Debug("ImgCompress err:",err)
return nil,err,i
}
s.PushImgMsg(bc)
- t1 := time.Now()
s.GetFaceFea()
- logger.Debug("GetFaceFea鐢ㄦ椂:", time.Since(t1))
if s.Result == nil{
return nil,errors.New("no fea"),i
} else {
@@ -89,13 +83,6 @@
}
func (s *FaceSdkService) ReadFromUploadImg() (*protomsg.Image,error){
- //defer (*(s.File)).Close()
- //imgB, err := ioutil.ReadAll(*(s.File))
- //if err !=nil{
- // logger.Debug("File.Read err:",err)
- // return nil,err
- //}
-
picMat, err := gocv.IMDecode(s.File, gocv.IMReadColor)
if err !=nil {
logger.Debug("gocv.IMDecode err:",err)
@@ -108,6 +95,8 @@
}
defer picMat.Close()
+ defer newMat.Close()
+
if picMat.Empty() {
logger.Debug("file not exist")
return nil,errors.New("picMat is empty")
@@ -129,18 +118,13 @@
}
func ImgCompress(i *protomsg.Image) ([]byte,error){
- t1 := time.Now()
if b, err := proto.Marshal(i); err != nil {
logger.Debug("protoImage marshal err")
return nil,err
} else {
- logger.Debug("proto.Marshal鐢ㄦ椂锛�", time.Since(t1))
- t1 = time.Now()
bc := make([]byte, len(b))
ht := make([]int, 64<<10)
n, err := lz4.CompressBlock(b, bc, ht)
- logger.Debug("lz4.CompressBlock鐢ㄦ椂锛�", time.Since(t1))
- t1 = time.Now()
if err != nil {
logger.Debug(err)
return nil,err
@@ -150,7 +134,6 @@
return nil,errors.New("compressed len is 0")
}
bc = bc[:n]
- logger.Debug("bc鐢ㄦ椂锛�", time.Since(t1))
return bc,nil
}
}
--
Gitblit v1.8.0