From 9d9cd1d3b93613071d1dffc1c82c4515d2a65af6 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 21 一月 2020 17:22:39 +0800
Subject: [PATCH] bug fixed change real fetcher ip
---
util/data.go | 72 +++++-------------------------------
1 files changed, 10 insertions(+), 62 deletions(-)
diff --git a/util/data.go b/util/data.go
index dfd4889..23844a0 100644
--- a/util/data.go
+++ b/util/data.go
@@ -1,67 +1,24 @@
package util
-// FetchServerInfo 浠巗qlite鐨勬湇鍔″櫒鑾峰彇鍚屾淇℃伅鐨勬湇鍔�
+// FetchServerInfo 浠巗qlite鐨勬湇鍔″櫒鑾峰彇SDK淇℃伅鐨勬湇鍔″櫒淇℃伅
type FetchServerInfo struct {
IP string
- HTTPort int
HBPort int //蹇冭烦绔彛
DataPort int //鏁版嵁绔彛
}
-// SDKFaceInfo face
-type SDKFaceInfo struct {
- DetectThrd int
- DetectNum int
- DetectAngle int
- PropThrd int
- ExtractThrd int
- TrackInterval int
- SampleSize int
-}
-
-// SDKCarInfo car
-type SDKCarInfo struct {
- LicenseServerPath string
- Model string
- MaxImageWidth int
- MaxImageHeight int
-}
-
var (
- // FSI 鍚屾鏈嶅姟鍣ㄤ俊鎭�
+ // FSI SDK淇℃伅鏈嶅姟鍣↖P/Port
FSI = &FetchServerInfo{
IP: "127.0.0.1",
- HTTPort: 8001,
- HBPort: 40007,
- DataPort: 50007,
- }
-
- // SFI 浜鸿劯淇℃伅
- SFI = &SDKFaceInfo{
- DetectThrd: 16,
- DetectNum: 30,
- DetectAngle: 60,
- PropThrd: 16,
- ExtractThrd: 16,
- TrackInterval: 3,
- SampleSize: 720,
- }
-
- // SCI sdkcarinfo
- SCI = &SDKCarInfo{
- LicenseServerPath: "./vrt.key",
- Model: "./data/model",
- MaxImageWidth: 4096,
- MaxImageHeight: 2160,
+ HBPort: 5005,
+ DataPort: 4005,
}
// ToRuleIPC to ruleprocess
ToRuleIPC = "ipc:///tmp/sdk-2-rules-process.ipc"
- // RunParams slave杩涚▼闇�瑕佺殑鍙傛暟,浠巑aster浼犲叆
- RunParams []string
-
- // MapParames 淇濆瓨鍙傛暟map,澶囨洿鏂�
+ // MapParames map params
MapParames = make(map[string]string)
// LogFile log
@@ -77,23 +34,14 @@
)
const (
- RuleIPC = "rule-ipc"
+ GPU = "gpu"
+ SHM = "shm"
+ LogIt = "logit"
+ ConfigPath = "config-path"
FetchSrvIP = "fetch-server-ip"
- FetchSrvPort = "fetch-server-port"
FetchSrvHeartbeatPort = "fetch-server-heartbeat-port"
FetchSrvDataPort = "fetch-server-data-port"
- FaceDetectThread = "face-detect-thread"
- FaceDetectNum = "face-detect-num"
- FaceDetectAngle = "face-detect-angle"
- FacePropertyThread = "face-property-thread"
- FaceExtractThread = "face-extract-thread"
- FaceTrackInterval = "face-track-interval"
- FaceTrackSample = "face-track-sample"
-
- CarSDKLicense = "car-sdk-license"
- CarMaxImageWidth = "car-max-image-width"
- CarMaxImageHeight = "car-max-image-height"
- CarSDKModel = "car-sdk-model"
+ RuleIPC = "rule-ipc"
)
--
Gitblit v1.8.0