Commit 5ab1fd93 authored by duanjinfei's avatar duanjinfei

add msg resp

parent ad9d0884
...@@ -64,8 +64,10 @@ func (c *NodeController) SetBenefitAddress() { ...@@ -64,8 +64,10 @@ func (c *NodeController) SetBenefitAddress() {
err = utils.WriteBenefitFile(nm.HistoryBenefitAcc) err = utils.WriteBenefitFile(nm.HistoryBenefitAcc)
if err != nil { if err != nil {
c.ResponseInfo(500, "Write benefit file failed", "") c.ResponseInfo(500, "Write benefit file failed", "")
return
} }
} }
nm.IsUpdateBenefitAddr = true
c.ResponseInfo(200, "set benefit address successful", "") c.ResponseInfo(200, "set benefit address successful", "")
} }
......
...@@ -13,13 +13,15 @@ type NodeManager struct { ...@@ -13,13 +13,15 @@ type NodeManager struct {
} }
var ( var (
HistoryBenefitAcc []*models.BenefitAddressStruct HistoryBenefitAcc []*models.BenefitAddressStruct
RunningState *models.RunningState RunningState *models.RunningState
IsRecvTask bool IsRecvTask bool
IsUpdateBenefitAddr bool
) )
func init() { func init() {
IsRecvTask = false IsRecvTask = false
IsUpdateBenefitAddr = false
HistoryBenefitAcc = make([]*models.BenefitAddressStruct, 0) HistoryBenefitAcc = make([]*models.BenefitAddressStruct, 0)
RunningState = &models.RunningState{ RunningState = &models.RunningState{
RunningTime: time.Now().Unix(), RunningTime: time.Now().Unix(),
......
...@@ -81,10 +81,15 @@ func (m *MonitorNm) monitorNmClient() { ...@@ -81,10 +81,15 @@ func (m *MonitorNm) monitorNmClient() {
for { for {
if !IsRecvTask { if !IsRecvTask {
log.Warn("User set recv task status is false") log.Warn("User set recv task status is false")
msgRespWorker.RegisterMsgResp(nodeManager, worker, RegisterInfoResp, nil) msgRespWorker.RegisterMsgResp(nodeManager, worker, GoodbyeResp, nil)
nodeManager.UpdateStatus(false) nodeManager.UpdateStatus(false)
return return
} }
if IsUpdateBenefitAddr {
benefitAddrUpdateRespParam := utils.BuildParams(conf.GetConfig().BenefitAddress)
msgRespWorker.RegisterMsgResp(nodeManager, worker, BenefitAddrUpdateResp, benefitAddrUpdateRespParam)
IsUpdateBenefitAddr = false
}
sub := time.Now().Sub(nodeManager.GetLastHeartTime()).Seconds() sub := time.Now().Sub(nodeManager.GetLastHeartTime()).Seconds()
log.WithField("time(uint seconds)", sub).Info("Handler nm msg thread monitor heartbeat time") log.WithField("time(uint seconds)", sub).Info("Handler nm msg thread monitor heartbeat time")
rev, err := worker.Recv() rev, err := worker.Recv()
......
...@@ -344,6 +344,20 @@ func AddModelRunningResp(params ...interface{}) *nodemanagerV2.WorkerMessage { ...@@ -344,6 +344,20 @@ func AddModelRunningResp(params ...interface{}) *nodemanagerV2.WorkerMessage {
return addModelRunningRes return addModelRunningRes
} }
func BenefitAddrUpdateResp(params ...interface{}) *nodemanagerV2.WorkerMessage {
log.Info("Benefit addr update response received params:", params)
addr := params[0].(string)
benefitAddrUpdateResp := &nodemanagerV2.WorkerMessage{
Message: &nodemanagerV2.WorkerMessage_BenefitAddrUpdate{
BenefitAddrUpdate: &nodemanagerV2.BenefitAddrUpdate{
BenefitAddress: addr,
},
},
}
log.Info("---------------------------------------Send Benefit addr update response msg ------------------------------------")
return benefitAddrUpdateResp
}
func RunningModelStatusResp(params ...interface{}) *nodemanagerV2.WorkerMessage { func RunningModelStatusResp(params ...interface{}) *nodemanagerV2.WorkerMessage {
log.Info("Add model running response received params:", params) log.Info("Add model running response received params:", params)
info := params[0].(*models.ModelInfo) info := params[0].(*models.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