mirror of
https://github.com/gravitl/netmaker.git
synced 2024-09-20 15:26:04 +08:00
ee update
This commit is contained in:
parent
85be6d76c8
commit
e4d44b5fab
|
@ -467,7 +467,7 @@ func getNode(w http.ResponseWriter, r *http.Request) {
|
|||
}
|
||||
|
||||
if servercfg.Is_EE && nodeRequest {
|
||||
if err = logic.EnterpriseResetAllPeersFailovers(node.ID.String(), node.Network); err != nil {
|
||||
if err = logic.EnterpriseResetAllPeersFailovers(node.ID, node.Network); err != nil {
|
||||
logger.Log(1, "failed to reset failover list during node config pull", node.ID.String(), node.Network)
|
||||
}
|
||||
}
|
||||
|
@ -952,7 +952,7 @@ func updateNode(w http.ResponseWriter, r *http.Request) {
|
|||
ifaceDelta := logic.IfaceDelta(¤tNode, newNode)
|
||||
|
||||
if ifaceDelta && servercfg.Is_EE {
|
||||
if err = logic.EnterpriseResetAllPeersFailovers(currentNode.ID.String(), currentNode.Network); err != nil {
|
||||
if err = logic.EnterpriseResetAllPeersFailovers(currentNode.ID, currentNode.Network); err != nil {
|
||||
logger.Log(0, "failed to reset failover lists during node update for node", currentNode.ID.String(), currentNode.Network)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -101,7 +101,7 @@ func DeleteNode(node *models.Node, purge bool) error {
|
|||
return err
|
||||
}
|
||||
if servercfg.Is_EE {
|
||||
if err := EnterpriseResetAllPeersFailovers(node.ID.String(), node.Network); err != nil {
|
||||
if err := EnterpriseResetAllPeersFailovers(node.ID, node.Network); err != nil {
|
||||
logger.Log(0, "failed to reset failover lists during node delete for node", host.Name, node.Network)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -3,6 +3,7 @@ package logic
|
|||
import (
|
||||
"strings"
|
||||
|
||||
"github.com/google/uuid"
|
||||
"github.com/gravitl/netmaker/models"
|
||||
)
|
||||
|
||||
|
@ -16,7 +17,7 @@ var EnterpriseFailoverFunc func(node *models.Node) error
|
|||
var EnterpriseResetFailoverFunc func(network string) error
|
||||
|
||||
// EnterpriseResetAllPeersFailovers - resets all nodes that are considering a node to be failover worthy (inclusive)
|
||||
var EnterpriseResetAllPeersFailovers func(nodeid, network string) error
|
||||
var EnterpriseResetAllPeersFailovers func(nodeid uuid.UUID, network string) error
|
||||
|
||||
// == Join, Checkin, and Leave for Server ==
|
||||
|
||||
|
|
|
@ -98,7 +98,7 @@ func UpdateNode(client mqtt.Client, msg mqtt.Message) {
|
|||
|
||||
ifaceDelta := logic.IfaceDelta(¤tNode, &newNode)
|
||||
if servercfg.Is_EE && ifaceDelta {
|
||||
if err = logic.EnterpriseResetAllPeersFailovers(currentNode.ID.String(), currentNode.Network); err != nil {
|
||||
if err = logic.EnterpriseResetAllPeersFailovers(currentNode.ID, currentNode.Network); err != nil {
|
||||
logger.Log(1, "failed to reset failover list during node update", currentNode.ID.String(), currentNode.Network)
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue