From 77a05fa27d55ea7e39aee47f71cb5f74308e5e0e Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期五, 30 八月 2019 11:08:06 +0800
Subject: [PATCH] stop bigcache init
---
ruleserver/readyDataForRule.go | 47 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 38 insertions(+), 9 deletions(-)
diff --git a/ruleserver/readyDataForRule.go b/ruleserver/readyDataForRule.go
index 3e4b712..b99c2be 100644
--- a/ruleserver/readyDataForRule.go
+++ b/ruleserver/readyDataForRule.go
@@ -1,21 +1,21 @@
package ruleserver
import (
- bigCache "basic.com/pubsub/cache.git"
"basic.com/pubsub/cache.git/esutil"
"basic.com/pubsub/protomsg.git"
"encoding/json"
+ "errors"
"fmt"
"github.com/go-yaml/yaml"
+ "github.com/golang/protobuf/proto"
"io/ioutil"
"math"
"nanomsg.org/go-mangos"
"nanomsg.org/go-mangos/protocol/req"
"nanomsg.org/go-mangos/transport/tcp"
- "os"
+ "net"
"ruleprocess/cache"
"ruleprocess/logger"
- "github.com/golang/protobuf/proto"
"ruleprocess/structure"
"strconv"
"time"
@@ -50,7 +50,7 @@
logger.Error("鏌ヨ鏈満淇℃伅澶辫触锛�")
}
logger.Debug("鏈満淇℃伅鍜宻erver淇℃伅锛�", localConfig, serverIp, serverPort)
- bigCache.Init(dbTablePersons, serverIp, serverPort, localConfig.ServerId)
+ //bigCache.Init(dbTablePersons, serverIp, serverPort, localConfig.ServerId)
sock, err = req.NewSocket();
if err != nil {
logger.Error("鍒涘缓璇锋眰socket澶辫触: %s", err.Error())
@@ -154,7 +154,8 @@
CompareThreshold:compareThreshold,
Source:false,
}
- bytes := Push("tcp://192.168.1.182:40010",comArg,sock)
+ serverIp, _ := GetLocalIP()
+ bytes := Push("tcp://"+serverIp+":40010",comArg,sock)
var scResult protomsg.SdkCompareResult
err1 := proto.Unmarshal(bytes, &scResult)
if err1 != nil {
@@ -278,13 +279,13 @@
if threshold <= obj.Score && size <= float64(obj.Rects.Width*obj.Rects.Height) && intersectionper <= PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale) {
// 杩欐瑕佸榻愯〃杈惧紡閲屾墍闇�瑕佺殑鎵�鏈夊弬鏁�
a.TargetNum++
- arg1 := structure.Arg{obj.Id,obj.Score, PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale), float64(obj.Rects.Width * obj.Rects.Height), obj.IsYolo, obj.Rects, obj.Feature, obj.ThftRes, []*BaseInfo{}}
+ arg1 := structure.Arg{obj.Id,obj.Score, PgsInterPercent(areaPoints, obj.Rects, widthScale, heigthScale), float64(obj.Rects.Width * obj.Rects.Height), obj.IsYolo, obj.Rects, obj.Feature, obj.ThftRes, []*structure.BaseInfo{}}
//logger.Println("鏀捐繘鍘荤殑arg锛�-------", arg1)
a.Args = append(a.Args, &arg1)
a.FilterData = append(a.FilterData, &arg1)
}
}
- //logger.Info("鍖哄煙鏄細",areaPoints,"鍖哄煙鍐呯洰鏍囨暟閲忎负锛�",a.targetNum,"---",len(a.filterData))
+ logger.Info("鍖哄煙鏄細",areaPoints,"瑁呴厤瀹屾暟鎹尯鍩熷唴鐩爣鏁伴噺涓猴細",a.TargetNum)
a.Time = time.Unix(time.Now().Unix(), 0).String()[11:16]
a.KeepRight = arg.KeepRight
a.IsStatic = arg.IsStatic
@@ -334,12 +335,40 @@
//bytes := []byte("ndfasojdfaidsos")
if err = sock.Send(bytes); err != nil {
logger.Error("鎺ㄩ�乻ocket鍙戦�佹暟鎹け璐�: %s", err.Error())
- os.Exit(1)
+ //os.Exit(1)
}
if msg, err = sock.Recv(); err != nil {
logger.Error("鎺ユ敹鍝嶅簲澶辫触: %s", err.Error())
- os.Exit(1)
+ //os.Exit(1)
}
logger.Debug("鏁版嵁鎺ㄩ�佹垚鍔燂紒鏀跺埌鍝嶅簲,鏁版嵁闀垮害涓猴細",len(msg))
return msg
}
+
+// 鑾峰彇鏈満ip
+func GetLocalIP() (ipv4 string, err error) {
+ var (
+ addrs []net.Addr
+ addr net.Addr
+ ipNet *net.IPNet // IP鍦板潃
+ isIpNet bool
+ )
+ // 鑾峰彇鎵�鏈夌綉鍗�
+ if addrs, err = net.InterfaceAddrs(); err != nil {
+ return
+ }
+ // 鍙栫涓�涓潪lo鐨勭綉鍗P
+ for _, addr = range addrs {
+ // 杩欎釜缃戠粶鍦板潃鏄疘P鍦板潃: ipv4, ipv6
+ if ipNet, isIpNet = addr.(*net.IPNet); isIpNet && !ipNet.IP.IsLoopback() {
+ // 璺宠繃IPV6
+ if ipNet.IP.To4() != nil {
+ ipv4 = ipNet.IP.String() // 192.168.1.1
+ return
+ }
+ }
+ }
+
+ err = errors.New("ipv4 not found")
+ return
+}
\ No newline at end of file
--
Gitblit v1.8.0