Commit 418b128c authored by duanjinfei's avatar duanjinfei

update model resp result unmashal

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