From 6fa3dbf51db482430271979840734859200bf392 Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期一, 20 一月 2020 11:43:09 +0800
Subject: [PATCH] bug fixed reid.go runcommunication parameter
---
app/master/master.go | 104 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 68 insertions(+), 36 deletions(-)
diff --git a/app/master/master.go b/app/master/master.go
index d4dd0a6..1199713 100644
--- a/app/master/master.go
+++ b/app/master/master.go
@@ -5,9 +5,14 @@
"analysis/logo"
"analysis/util"
"context"
- "io/ioutil"
+ "encoding/json"
+ "os"
+ "strconv"
+ "strings"
+ "time"
"basic.com/libgowrapper/sdkstruct.git"
+ "basic.com/valib/pubsub.git"
)
func reaper(ctxt context.Context) {
@@ -17,52 +22,64 @@
}
// Run run
-func Run(ctx context.Context, configPath string) bool {
+func Run(ctx context.Context, soFile, configPath string) bool {
reaper(ctx)
- rPath := configPath
- configFile := configPath
- var fetcher *Fetcher
-
- fs, _ := ioutil.ReadDir(rPath)
- for _, file := range fs {
- if !file.IsDir() {
- if rPath[len(rPath)-1] != '/' {
- configFile = rPath + "/" + file.Name()
- } else {
- configFile = rPath + file.Name()
- }
-
- cfg, err := app.ReadConfig(configFile)
- if err != nil {
- logo.Errorln("Run Fetcher Master Read From File: ", configFile, " Config Error: ", err)
- continue
- }
- fetcher = NewFetcher(cfg.SoFile)
- if fetcher == nil {
- logo.Errorln("New Fetcher Load so File Funcs Error From File: ", cfg.SoFile)
- continue
- }
- }
- }
+ fetcher := NewFetcher(soFile)
if fetcher == nil {
- logo.Errorln("!!!!!!Read All So File, But Can't Init DB Fetcher")
+ logo.Errorln("New Fetcher Load so File Funcs Error From File: ", soFile)
return false
}
logo.Infoln("~~~~~~Created Fetcher, Now Sync From DB")
- // fetcher.fnInitDBAPI(util.FSI.IP, util.FSI.HTTPort, util.FSI.HBPort, util.FSI.DataPort, logo.Infoln)
- fetcher.fnInitDBAPI("192.168.20.10", util.FSI.HTTPort, util.FSI.HBPort, util.FSI.DataPort, logo.Infoln)
- sdks := fetcher.fnSDKInfo()
+ ip := "tcp://" + util.FSI.IP
+ url := ip + ":" + strconv.Itoa(util.FSI.DataPort)
+ hearturl := ip + ":" + strconv.Itoa(util.FSI.HBPort)
- return manualStart(ctx, sdks, configPath)
+ chMsg, err := fetcher.fnInit(url, hearturl, 0, []string{pubsub.Topic_Sdk}, "analysis-master"+strconv.Itoa(os.Getpid()))
+ for {
+ if err == nil {
+ break
+ }
+ logo.Infoln("Analysis Fetcher INIT Error! URL:", url)
+ time.Sleep(time.Second)
+ chMsg, err = fetcher.fnInit(url, hearturl, 0, []string{pubsub.Topic_Sdk}, "analysis-master"+strconv.Itoa(os.Getpid()))
+ }
+
+ for {
+ select {
+ case <-ctx.Done():
+ return true
+ case msg := <-chMsg:
+ // sdktype process_name topic null
+ // yolo/face yolo_0/yolo_1 channel
+ var sdk map[string](map[string](map[string]interface{}))
+
+ if err := json.Unmarshal(msg.Msg, &sdk); err != nil {
+ logo.Infoln("Fetcher SDK unmarshal err:", err)
+ continue
+ }
+
+ logo.Infoln("~~~~~~Recv New SDKInfos")
+ chCameras <- CameraInfo{
+ Cameras: cameras,
+ }
+ logo.Infoln("~~~~~~Recv New SDKInfos Over")
+
+ default:
+ time.Sleep(10 * time.Millisecond)
+ }
+ }
+
}
func manualStart(ctx context.Context, sdks []sdkstruct.SDKInfo, configPath string) bool {
rPath := configPath
- for k, v := range sdks {
+ params := app.GetParams()
+
+ for _, v := range sdks {
file := rPath + v.SdkType + ".json"
if rPath[len(rPath)-1] != '/' {
@@ -75,6 +92,21 @@
continue
}
+ if len(cfg.Env) > 0 {
+ envs := strings.Split(cfg.Env, ":")
+ normal := true
+ for _, v := range envs {
+ if !util.IsFileExist(v) {
+ normal = false
+ break
+ }
+ }
+ if !normal {
+ logo.Infoln("Can't Find Runtime Path, Skip It: ", file)
+ continue
+ }
+ }
+
logo.Infoln(file, " CONFIG: ", cfg)
args := []string{
@@ -84,13 +116,13 @@
"-" + util.ConfigPath + "=" + file,
}
- args = append(args, app.GetParams(util.ConfigPath, file)...)
- pid, err := runProc(ctx, "./analysis", args, &cfg.Env)
+ args = append(args, params...)
+ pid, err := runProc(ctx, "./analysis", args, cfg.Env)
if err != nil {
logo.Errorf("ANALYSIS START SLAVE PROC %s IPC: %s error %+v\n", v.SdkType, v.IpcID, err)
}
- logo.Infof("START %d PROC %d SDK %s ID %s\n", k, pid, v.IpcID, v.SdkType)
+ logo.Infof("START SDK %s ID %s PID %d Env: %s\n", v.SdkType, v.IpcID, pid, cfg.Env)
}
return true
--
Gitblit v1.8.0