diff --git a/internal/rpc/services/service_node_stream.go b/internal/rpc/services/service_node_stream.go index 189b281c..001593a8 100644 --- a/internal/rpc/services/service_node_stream.go +++ b/internal/rpc/services/service_node_stream.go @@ -112,24 +112,24 @@ func (this *NodeService) NodeStream(server pb.NodeService_NodeStreamServer) erro var tx = this.NullTx() - // 标记为活跃状态 + // 是否发送恢复通知 oldIsActive, err := models.SharedNodeDAO.FindNodeActive(tx, nodeId) if err != nil { return err } - if !oldIsActive { inactiveNotifiedAt, err := models.SharedNodeDAO.FindNodeInactiveNotifiedAt(tx, nodeId) if err != nil { return err } - if inactiveNotifiedAt > 0 { - // 设置为活跃 - err = models.SharedNodeDAO.UpdateNodeActive(tx, nodeId, true) - if err != nil { - return err - } + // 设置为活跃 + err = models.SharedNodeDAO.UpdateNodeActive(tx, nodeId, true) + if err != nil { + return err + } + + if inactiveNotifiedAt > 0 { // 发送恢复消息 clusterId, err := models.SharedNodeDAO.FindNodeClusterId(tx, nodeId) if err != nil { @@ -145,12 +145,6 @@ func (this *NodeService) NodeStream(server pb.NodeService_NodeStreamServer) erro if err != nil { return err } - } else { - // 设置为活跃 - err = models.SharedNodeDAO.UpdateNodeActive(tx, nodeId, true) - if err != nil { - return err - } } }