消息中增加恢复成功的消息

This commit is contained in:
刘祥超
2020-11-16 09:20:24 +08:00
parent 58cae9a5e5
commit 5ef3e4acaf
7 changed files with 70 additions and 4 deletions

View File

@@ -21,7 +21,6 @@ func init() {
go func() {
service := &NodeService{}
for nodeId := range events.NodeDNSChanges {
logs.Println("change dns: ", nodeId)
err := service.notifyNodeDNSChanged(nodeId)
if err != nil {
logs.Println("[ERROR]change node dns: " + err.Error())
@@ -450,7 +449,6 @@ func (this *NodeService) UpdateNodeStatus(ctx context.Context, req *pb.UpdateNod
if err != nil {
return nil, err
}
return &pb.RPCSuccess{}, nil
}

View File

@@ -8,6 +8,7 @@ import (
"github.com/TeaOSLab/EdgeAPI/internal/db/models"
"github.com/TeaOSLab/EdgeAPI/internal/errors"
rpcutils "github.com/TeaOSLab/EdgeAPI/internal/rpc/utils"
"github.com/TeaOSLab/EdgeAPI/internal/utils/numberutils"
"github.com/TeaOSLab/EdgeCommon/pkg/messageconfigs"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/iwind/TeaGo/logs"
@@ -93,7 +94,29 @@ func (this *NodeService) NodeStream(server pb.NodeService_NodeStreamServer) erro
}
}
logs.Println("[RPC]accepted node '" + strconv.FormatInt(nodeId, 10) + "' connection")
logs.Println("[RPC]accepted node '" + numberutils.FormatInt64(nodeId) + "' connection")
// 标记为活跃状态
oldIsActive, err := models.SharedNodeDAO.FindNodeActive(nodeId)
if err != nil {
return err
}
if !oldIsActive {
err = models.SharedNodeDAO.UpdateNodeActive(nodeId, true)
if err != nil {
return err
}
// 发送恢复消息
clusterId, err := models.SharedNodeDAO.FindNodeClusterId(nodeId)
if err != nil {
return err
}
err = models.SharedMessageDAO.CreateNodeMessage(clusterId, nodeId, models.MessageTypeNodeActive, models.MessageLevelSuccess, "节点已经恢复在线", nil)
if err != nil {
return err
}
}
nodeLocker.Lock()
requestChan, ok := requestChanMap[nodeId]