zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-10 03:00:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

ee update

Browse Source
This commit is contained in:
0xdcarns
2023-01-14 12:00:44 -05:00
parent 85be6d76c8
commit e4d44b5fab
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
controllers/node.go
View File

@@ -467,7 +467,7 @@ func getNode(w http.ResponseWriter, r *http.Request) {
} }
if servercfg.Is_EE && nodeRequest { 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) 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(&currentNode, newNode) ifaceDelta := logic.IfaceDelta(&currentNode, newNode)
if ifaceDelta && servercfg.Is_EE { 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) logger.Log(0, "failed to reset failover lists during node update for node", currentNode.ID.String(), currentNode.Network)
} }
} }

2
logic/nodes.go
View File

@@ -101,7 +101,7 @@ func DeleteNode(node *models.Node, purge bool) error {
return err return err
} }
if servercfg.Is_EE { 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) logger.Log(0, "failed to reset failover lists during node delete for node", host.Name, node.Network)
} }
} }

3
logic/server.go
View File

@@ -3,6 +3,7 @@ package logic
import ( import (
"strings" "strings"
"github.com/google/uuid"
"github.com/gravitl/netmaker/models" "github.com/gravitl/netmaker/models"
) )
@@ -16,7 +17,7 @@ var EnterpriseFailoverFunc func(node *models.Node) error
var EnterpriseResetFailoverFunc func(network string) error var EnterpriseResetFailoverFunc func(network string) error
// EnterpriseResetAllPeersFailovers - resets all nodes that are considering a node to be failover worthy (inclusive) // 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 == // == Join, Checkin, and Leave for Server ==

2
mq/handlers.go
View File

@@ -98,7 +98,7 @@ func UpdateNode(client mqtt.Client, msg mqtt.Message) {
ifaceDelta := logic.IfaceDelta(&currentNode, &newNode) ifaceDelta := logic.IfaceDelta(&currentNode, &newNode)
if servercfg.Is_EE && ifaceDelta { 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) logger.Log(1, "failed to reset failover list during node update", currentNode.ID.String(), currentNode.Network)
} }
} }