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

addressed PR comments

Browse Source
This commit is contained in:
0xdcarns
2022-09-29 09:49:06 -04:00
parent e5ffe3114d
commit f2606dd3cb
5 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/node.go
View File

@@ -887,7 +887,7 @@ func updateNode(w http.ResponseWriter, r *http.Request) {
} }
if ifaceDelta && servercfg.Is_EE { if ifaceDelta && servercfg.Is_EE {
if err = logic.EnterpriseResetAllPeersFailovers.(func(string, string) error)(node.ID, node.Network); err != nil { if err = logic.EnterpriseResetAllPeersFailovers(node.ID, node.Network); err != nil {
logger.Log(0, "failed to reset failover lists during node update for node", node.Name, node.Network) logger.Log(0, "failed to reset failover lists during node update for node", node.Name, node.Network)
} }
} }

2
logic/gateway.go
View File

@@ -276,7 +276,7 @@ func DeleteIngressGateway(networkName string, nodeid string) (models.Node, error
} }
} }
err = EnterpriseResetFailoverFunc.(func(string) error)(node.Network) err = EnterpriseResetFailoverFunc(node.Network)
if err != nil { if err != nil {
logger.Log(0, "failed to reset failover on network", node.Network, ":", err.Error()) logger.Log(0, "failed to reset failover on network", node.Network, ":", err.Error())
} }

10
logic/server.go
View File

@@ -19,16 +19,16 @@ import (
) )
// EnterpriseCheckFuncs - can be set to run functions for EE // EnterpriseCheckFuncs - can be set to run functions for EE
var EnterpriseCheckFuncs []interface{} var EnterpriseCheckFuncs []func()
// EnterpriseFailoverFunc - interface to control failover funcs // EnterpriseFailoverFunc - interface to control failover funcs
var EnterpriseFailoverFunc interface{} var EnterpriseFailoverFunc func(node *models.Node) error
// EnterpriseResetFailoverFunc - interface to control reset failover funcs // EnterpriseResetFailoverFunc - interface to control reset failover funcs
var EnterpriseResetFailoverFunc interface{} 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 interface{} var EnterpriseResetAllPeersFailovers func(nodeid, network string) error
// == Join, Checkin, and Leave for Server == // == Join, Checkin, and Leave for Server ==
@@ -179,7 +179,7 @@ func ServerJoin(networkSettings *models.Network) (models.Node, error) {
// EnterpriseCheck - Runs enterprise functions if presented // EnterpriseCheck - Runs enterprise functions if presented
func EnterpriseCheck() { func EnterpriseCheck() {
for _, check := range EnterpriseCheckFuncs { for _, check := range EnterpriseCheckFuncs {
check.(func())() check()
} }
} }

2
mq/handlers.go
View File

@@ -136,7 +136,7 @@ func UpdateMetrics(client mqtt.Client, msg mqtt.Message) {
} }
if newMetrics.Connectivity != nil { if newMetrics.Connectivity != nil {
err := logic.EnterpriseFailoverFunc.(func(*models.Node) error)(&currentNode) err := logic.EnterpriseFailoverFunc(&currentNode)
if err != nil { if err != nil {
logger.Log(0, "failed to failover for node", currentNode.Name, "on network", currentNode.Network, "-", err.Error()) logger.Log(0, "failed to failover for node", currentNode.Name, "on network", currentNode.Network, "-", err.Error())
} }

1
netclient/functions/mqpublish.go
View File

@@ -39,7 +39,6 @@ func Checkin(ctx context.Context, wg *sync.WaitGroup) {
case <-ctx.Done(): case <-ctx.Done():
logger.Log(0, "checkin routine closed") logger.Log(0, "checkin routine closed")
return return
//delay should be configuraable -> use cfg.Node.NetworkSettings.DefaultCheckInInterval ??
case <-ticker.C: case <-ticker.C:
checkin() checkin()
} }