From 2388d5adbdfe5abaa8395a992bca134c093268b2 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 17 十二月 2019 11:17:41 +0800
Subject: [PATCH] ---
---
ruleserver/readyDataForRule.go | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go
index bdd79c4..590a493 100644
--- a/ruleserver/readyDataForRule.go
+++ b/ruleserver/readyDataForRule.go
@@ -3,10 +3,11 @@
import (
"basic.com/dbapi.git"
"basic.com/pubsub/protomsg.git"
+ "encoding/base64"
"encoding/json"
"errors"
"fmt"
- logger "github.com/alecthomas/log4go"
+ "basic.com/valib/logger.git"
"github.com/golang/protobuf/proto"
"math"
"nanomsg.org/go-mangos"
@@ -115,9 +116,10 @@
// 缁欑洰鏍囧～鍏卨iker
func fillLiker(tableId []string, compareThreshold float32,arg *structure.Arg) {
//bytes := bigCache.GetComparePersonBaseInfo(tableId, arg.Feature, compareThreshold)
+ decodeBytes, _ := base64.StdEncoding.DecodeString(arg.Feature)
comArg := &protomsg.CompareArgs{
TableIds:tableId,
- FaceFeature:arg.Feature,
+ FaceFeature:decodeBytes,
CompareThreshold:compareThreshold,
Source:false,
}
@@ -281,12 +283,12 @@
//}
errSize := sock.SetOption(mangos.OptionMaxRecvSize,5*1024*1024)
if errSize != nil {
- _ = logger.Error("Failed set MaxRecvSize: %v", err)
+ logger.Error("Failed set MaxRecvSize: %v", err)
return nil
}
serverIP, _ := GetLocalIP()
if err = sock.Dial("tcp://"+serverIP+":4010"); err != nil {
- _ = logger.Error("璇锋眰socket鎷ㄥ彿澶辫触: %s", err.Error())
+ logger.Error("璇锋眰socket鎷ㄥ彿澶辫触: %s", err.Error())
}
//sock.AddTransport(ipc.NewTransport())
sock.AddTransport(tcp.NewTransport())
@@ -300,11 +302,11 @@
logger.Debug("鎺ㄩ�佹暟鎹�")
//bytes := []byte("ndfasojdfaidsos")
if err = sock.Send(bytes); err != nil {
- _ = logger.Error("鎺ㄩ�乻ocket鍙戦�佹暟鎹け璐�: %s", err.Error())
+ logger.Error("鎺ㄩ�乻ocket鍙戦�佹暟鎹け璐�: %s", err.Error())
//os.Exit(1)
}
if msg, err = sock.Recv(); err != nil {
- _ = logger.Error("鎺ユ敹鍝嶅簲澶辫触: %s", err.Error())
+ logger.Error("鎺ユ敹鍝嶅簲澶辫触: %s", err.Error())
//os.Exit(1)
}
logger.Debug("鏁版嵁鎺ㄩ�佹垚鍔燂紒鏀跺埌鍝嶅簲,鏁版嵁闀垮害涓猴細",len(msg))
@@ -317,17 +319,17 @@
var msg []byte
if sock, err = req.NewSocket(); err != nil {
- _ = logger.Error("鍒涘缓璇锋眰socket澶辫触: %s", err.Error())
+ logger.Error("鍒涘缓璇锋眰socket澶辫触: %s", err.Error())
}
errSize := sock.SetOption(mangos.OptionMaxRecvSize,5*1024*1024)
if errSize != nil {
- _ = logger.Error("Failed set MaxRecvSize: %v", err)
+ logger.Error("Failed set MaxRecvSize: %v", err)
}
//sock.AddTransport(ipc.NewTransport())
sock.AddTransport(tcp.NewTransport())
serverIP, _ := GetLocalIP()
if err = sock.Dial("tcp://"+serverIP+":4010"); err != nil {
- _ = logger.Error("璇锋眰socket鎷ㄥ彿澶辫触: %s", err.Error())
+ logger.Error("璇锋眰socket鎷ㄥ彿澶辫触: %s", err.Error())
}
logger.Info("搴忓垪鍖栨暟鎹�")
@@ -344,15 +346,15 @@
}
logger.Debug("鎺ㄩ�佹暟鎹�")
if err = sock.Send(bytes); err != nil {
- _ = logger.Error("鎺ㄩ�乻ocket鍙戦�佹暟鎹け璐�: %s", err.Error())
+ logger.Error("鎺ㄩ�乻ocket鍙戦�佹暟鎹け璐�: %s", err.Error())
}
if msg, err = sock.Recv(); err != nil {
- _ = logger.Error("鎺ユ敹鍝嶅簲澶辫触: %s", err.Error())
+ logger.Error("鎺ユ敹鍝嶅簲澶辫触: %s", err.Error())
}
logger.Debug("鏁版嵁鎺ㄩ�佹垚鍔燂紒鏀跺埌鍝嶅簲,鏁版嵁闀垮害涓猴細",len(msg))
receiver <- msg
default:
- time.Sleep(time.Second)
+ time.Sleep(time.Millisecond * 10)
}
}
}
--
Gitblit v1.8.0