From 88b1f1d1d14a8fe9e3dde2f363a89d821fc0e641 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期四, 26 九月 2024 20:19:49 +0800
Subject: [PATCH] code format
---
serve/serve.go | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/serve/serve.go b/serve/serve.go
index d3584d7..0e4ccb1 100644
--- a/serve/serve.go
+++ b/serve/serve.go
@@ -24,16 +24,20 @@
logger.Infof("worker %d done", id)
return
default:
- msg, err := sock.Recv()
- if err != nil || len(msg) <= 0 {
- continue
+ var msg *mangos.Message
+ var err error
+ if msg, err = sock.RecvMsg(); err != nil {
+ return
}
var request facecompare.CompareRequest
- err = proto.Unmarshal(msg, &request)
+ err = proto.Unmarshal(msg.Body, &request)
if err != nil {
logger.Warn("CompareRequest json unmarshal error")
- continue
+ if err = sock.SendMsg(msg); err != nil {
+ logger.Warn("send reply err:", err.Error())
+ continue
+ }
}
var result []byte
@@ -41,11 +45,10 @@
var compareArgInfo protomsg.CompareArgs
if err = proto.Unmarshal(request.Payload, &compareArgInfo); err == nil {
timeStart := time.Now()
- result = compare.GetComparePersonBaseInfo(compareArgInfo)
+ result = compare.Walk(compareArgInfo)
logger.Debug("鐢ㄦ椂锛�", time.Since(timeStart))
} else {
logger.Warn("CompareArgs or EsPersonCacheChange json unmarshal error")
- continue
}
} else if request.CompareType == facecompare.CompareType_UpdateCache {
var compareEvent protomsg.CompareEvent
@@ -63,12 +66,12 @@
}
} else {
logger.Warn("CompareEvent json unmarshal error")
- continue
}
}
- err = sock.Send(result)
- if err != nil {
+ msg.Body = result
+
+ if err = sock.SendMsg(msg); err != nil {
logger.Warn("send reply err:", err.Error())
}
}
@@ -83,10 +86,12 @@
logger.Error("can't get new rep socket: %s", err)
return
}
+
if err = sock.SetOption(mangos.OptionRaw, true); err != nil {
logger.Error("can't set raw mode: %s", err)
return
}
+
sock.AddTransport(ipc.NewTransport())
sock.AddTransport(tcp.NewTransport())
if err = sock.Listen(url); err != nil {
--
Gitblit v1.8.0