Commit 36eb9196 authored by duanjinfei's avatar duanjinfei

report model info and handler output is nil

parent 040065d7
...@@ -15,7 +15,7 @@ import ( ...@@ -15,7 +15,7 @@ import (
func monitorModelInfo(dockerOp *operate.DockerOp) { func monitorModelInfo(dockerOp *operate.DockerOp) {
client := &http.Client{} client := &http.Client{}
ticker := time.NewTicker(time.Second * 1) ticker := time.NewTicker(time.Second * 10)
for { for {
select { select {
case <-ticker.C: case <-ticker.C:
......
...@@ -182,6 +182,7 @@ func monitorWorker(op *operate.DockerOp) { ...@@ -182,6 +182,7 @@ func monitorWorker(op *operate.DockerOp) {
msgRespWorker.RegisterMsgResp(nodeManager, worker, RegisterInfoResp, nil) msgRespWorker.RegisterMsgResp(nodeManager, worker, RegisterInfoResp, nil)
time.Sleep(time.Second * 2) time.Sleep(time.Second * 2)
msgRespWorker.RegisterMsgResp(nodeManager, worker, DeviceInfoResp, nil) msgRespWorker.RegisterMsgResp(nodeManager, worker, DeviceInfoResp, nil)
op.ModelTaskIdIndexesChan <- op.ReportTaskIds
isSend = true isSend = true
log.Info("------------------------Send once-off message ended------------------------") log.Info("------------------------Send once-off message ended------------------------")
} }
......
...@@ -374,6 +374,13 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage) ...@@ -374,6 +374,13 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
apiResBody := utils.EncodeJsonEscapeHTML(apiRes) apiResBody := utils.EncodeJsonEscapeHTML(apiRes)
taskExecResult.TaskRespBody = apiResBody taskExecResult.TaskRespBody = apiResBody
} }
} else {
taskExecResult.TaskExecError = fmt.Sprintf("worker:%s,%s", conf.GetConfig().SignPublicAddress.Hex(), "Container resp ouput is nil")
t.ExecTaskIdIsSuccess.Store(taskMsg.TaskId, true)
apiRes := make([]string, 0)
apiResBody := utils.EncodeJsonEscapeHTML(apiRes)
taskExecResult.TaskRespBody = apiResBody
return
} }
} }
} }
...@@ -652,6 +659,10 @@ func parseData(readBody []byte) interface{} { ...@@ -652,6 +659,10 @@ func parseData(readBody []byte) interface{} {
log.WithError(err).Error("Parse json raw message failed") log.WithError(err).Error("Parse json raw message failed")
return bytes.NewBuffer(readBody).String() return bytes.NewBuffer(readBody).String()
} }
if m["output"] == nil {
log.WithField("output", nil).Warn("The container resp")
return nil
}
var outputTwoArray [][]string var outputTwoArray [][]string
if err := json.Unmarshal(m["output"], &outputTwoArray); err != nil { if err := json.Unmarshal(m["output"], &outputTwoArray); err != nil {
log.WithField("err", err).Warn("parse two array output filed failed:") log.WithField("err", err).Warn("parse two array output filed failed:")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment