From 93d62ff96dafca109b426e397396ad3a46cf295d Mon Sep 17 00:00:00 2001
From: zhangmeng <775834166@qq.com>
Date: 星期二, 21 一月 2020 17:14:21 +0800
Subject: [PATCH] bug fixed and test
---
app/master/master.go | 7 ++++---
libgowrapper/humantrack | 2 +-
libgowrapper/vehicle | 2 +-
app/master/daemon.go | 16 +++++++++-------
libgowrapper/face | 2 +-
libgowrapper/yolo | 2 +-
6 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/app/master/daemon.go b/app/master/daemon.go
index 8e849b8..88bd840 100644
--- a/app/master/daemon.go
+++ b/app/master/daemon.go
@@ -237,11 +237,11 @@
removes := difference(w.info.Channels, proc.Channels)
if len(removes) > 0 {
// 閫氱煡瀛愯繘绋嬪叧闂�氶亾
- notice = Notice{
+ n := Notice{
Op: opRemove,
Content: removes,
}
- if d, err := json.Marshal(notice); err == nil {
+ if d, err := json.Marshal(n); err == nil {
w.trans.chNotify <- d
}
}
@@ -250,11 +250,11 @@
adds := difference(proc.Channels, w.info.Channels)
if len(adds) > 0 {
// 閫氱煡瀛愯繘绋嬫墦寮�閫氶亾
- notice = Notice{
+ n := Notice{
Op: opAdd,
Content: adds,
}
- if d, err := json.Marshal(notice); err == nil {
+ if d, err := json.Marshal(n); err == nil {
w.trans.chNotify <- d
}
}
@@ -373,8 +373,10 @@
if cmd == nil {
logo.Errorf("ANALYSIS START SLAVE PROC %s IPC: %s Failed\n", typ, ipcID)
+ return
}
logo.Infof("START SDK %s ID %s PID %d Env: %s\n", typ, ipcID, cmd.Process.Pid, info.Env)
+ logo.Infoln(cmd.Args)
ch := make(chan []byte, 3)
cancel := fnNotify(ctx, ipcID, ch, logo.Infoln)
@@ -407,9 +409,9 @@
os.Setenv(runtime, old)
}
- // //debug
- // cmd.Stdout = os.Stdout
- // cmd.Stderr = os.Stderr
+ //debug
+ cmd.Stdout = os.Stdout
+ cmd.Stderr = os.Stderr
cmd.SysProcAttr = &syscall.SysProcAttr{Pdeathsig: syscall.SIGTERM}
if err := cmd.Start(); err == nil {
diff --git a/app/master/master.go b/app/master/master.go
index 797d4d1..e4d0f91 100644
--- a/app/master/master.go
+++ b/app/master/master.go
@@ -96,7 +96,7 @@
continue
}
- logo.Infoln("~~~~~~Recv New SDKInfos")
+ logo.Infoln("~~~~~~Before Recv New SDKInfos")
var typeProcs []TypeProc
@@ -135,7 +135,7 @@
}
chProc <- typeProcs
- logo.Infoln("~~~~~~Recv New SDKInfos Over")
+ logo.Infof("~~~~~~Recv New SDKInfos %+v\n", typeProcs)
default:
time.Sleep(10 * time.Millisecond)
@@ -173,12 +173,13 @@
pathExist := true
for _, v := range envs {
if !util.IsFileExist(v) {
+ logo.Infoln("Can't Find Runtime Path:", v, "Skip SDK: ", typ)
pathExist = false
break
}
}
if !pathExist {
- logo.Infoln("Can't Find Runtime Path, Skip SDK: ", typ)
+
return nil
}
}
diff --git a/libgowrapper/face b/libgowrapper/face
index e8145a8..3cd31cd 160000
--- a/libgowrapper/face
+++ b/libgowrapper/face
@@ -1 +1 @@
-Subproject commit e8145a8ad902a0b9a05f3ccfb9868647875b3880
+Subproject commit 3cd31cdc3e4d5fb14a48c1f7e15a725aceedfd8b
diff --git a/libgowrapper/humantrack b/libgowrapper/humantrack
index 357d7a3..0571ff7 160000
--- a/libgowrapper/humantrack
+++ b/libgowrapper/humantrack
@@ -1 +1 @@
-Subproject commit 357d7a3df36a0d3d57e79ed9064ee81f332fdb29
+Subproject commit 0571ff7d873c7c97dcd8fb94df7cb26f7ebf2fc1
diff --git a/libgowrapper/vehicle b/libgowrapper/vehicle
index a93f6fe..d539cf8 160000
--- a/libgowrapper/vehicle
+++ b/libgowrapper/vehicle
@@ -1 +1 @@
-Subproject commit a93f6febea26558c208654a94f09fecd5637777a
+Subproject commit d539cf8dad7f8f6023b75886f54b7eeb28cb5b9b
diff --git a/libgowrapper/yolo b/libgowrapper/yolo
index eb7b3a3..554fba6 160000
--- a/libgowrapper/yolo
+++ b/libgowrapper/yolo
@@ -1 +1 @@
-Subproject commit eb7b3a3a8d7af5c051cb706669c0577f79b9813c
+Subproject commit 554fba69bb5f1c510c6da02c3a48fbde3a207688
--
Gitblit v1.8.0