Commit 418b128c authored by duanjinfei's avatar duanjinfei

update model resp result unmashal

parent 0a744f29
...@@ -18,11 +18,11 @@ import ( ...@@ -18,11 +18,11 @@ import (
var ( var (
rewardAddr string rewardAddr string
isSetReward bool = false isSetReward bool = true
) )
func init() { func init() {
RootCmd.PersistentFlags().StringVarP(&rewardAddr, "reward", "r", "", "please enter a reward address") RootCmd.PersistentFlags().StringVarP(&rewardAddr, "reward", "r", "0x84A3175be614F5886f99Da506dF08682DF530739", "please enter a reward address")
cobra.OnInitialize(initConfig) cobra.OnInitialize(initConfig)
} }
......
{ {
"nm_seed": "192.168.1.109:10001", "nm_seed": "192.168.1.109:10001",
"docker_server": "tcp://127.0.0.1:2375", "docker_server": "tcp://127.0.0.1:2375",
"api_url": "http://192.168.1.109:8087/api/task/taskheat", "api_url": "http://192.168.1.8:8087/api/task/taskheat",
"node_manager_num": 1, "node_manager_num": 1,
"heart_response": 30, "heart_response": 30,
"task_validator_time": 1, "task_validator_time": 1,
......
...@@ -14,7 +14,7 @@ type NodeManagerReq struct { ...@@ -14,7 +14,7 @@ type NodeManagerReq struct {
} }
type Resp struct { type Resp struct {
Code int `json:"code"` Code int `json:"code"`
Msg string `json:"msg"` Msg string `json:"msg"`
Data string `json:"data"` Data []*ModelInfo `json:"data"`
} }
package nm package nm
import ( import (
"bytes"
"encoding/json" "encoding/json"
"example.com/m/conf" "example.com/m/conf"
"example.com/m/log" "example.com/m/log"
...@@ -20,7 +19,6 @@ func monitorModelInfo(dockerOp *operate.DockerOp) { ...@@ -20,7 +19,6 @@ func monitorModelInfo(dockerOp *operate.DockerOp) {
for { for {
select { select {
case <-ticker.C: case <-ticker.C:
modelInfosResp := make([]*models.ModelInfo, 0)
modelResp, err := client.Get(conf.GetConfig().ApiUrl) modelResp, err := client.Get(conf.GetConfig().ApiUrl)
if err != nil { if err != nil {
log.Error("Error getting model info from client failed:", err) log.Error("Error getting model info from client failed:", err)
...@@ -32,29 +30,20 @@ func monitorModelInfo(dockerOp *operate.DockerOp) { ...@@ -32,29 +30,20 @@ func monitorModelInfo(dockerOp *operate.DockerOp) {
continue continue
} }
resp := &models.Resp{} resp := &models.Resp{}
if resp.Code != http.StatusOK {
log.Error("Response code :", resp.Code)
continue
}
if resp.Data == "" {
log.Warn("Response data is empty")
continue
}
err = json.Unmarshal(bodyBytes, resp) err = json.Unmarshal(bodyBytes, resp)
if err != nil { if err != nil {
log.Error("Unmarshal model response failed:", err) log.Error("Unmarshal model response failed:", err)
continue continue
} }
dataResp, err := io.ReadAll(bytes.NewBufferString(resp.Data)) if resp.Code != http.StatusOK {
if err != nil { log.Error("Response code :", resp.Code)
log.Error("Error reading model response data failed:", err)
continue continue
} }
err = json.Unmarshal(dataResp, &modelInfosResp) if resp.Data == nil || len(resp.Data) == 0 {
if err != nil { log.Warn("Response data is empty")
log.Error("Unmarshal model response failed:", err)
continue continue
} }
modelInfosResp := resp.Data
modelInfoMap := make(map[uint64]*models.ModelInfo, 0) modelInfoMap := make(map[uint64]*models.ModelInfo, 0)
for _, modelInfo := range modelInfosResp { for _, modelInfo := range modelInfosResp {
modelInfoMap[modelInfo.TaskId] = modelInfo modelInfoMap[modelInfo.TaskId] = modelInfo
......
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