mirror of
https://github.com/gravitl/netmaker.git
synced 2025-10-30 11:46:28 +08:00
addressed PR comments
This commit is contained in:
@@ -887,7 +887,7 @@ func updateNode(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
|
||||
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)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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 {
|
||||
logger.Log(0, "failed to reset failover on network", node.Network, ":", err.Error())
|
||||
}
|
||||
|
||||
@@ -19,16 +19,16 @@ import (
|
||||
)
|
||||
|
||||
// EnterpriseCheckFuncs - can be set to run functions for EE
|
||||
var EnterpriseCheckFuncs []interface{}
|
||||
var EnterpriseCheckFuncs []func()
|
||||
|
||||
// EnterpriseFailoverFunc - interface to control failover funcs
|
||||
var EnterpriseFailoverFunc interface{}
|
||||
var EnterpriseFailoverFunc func(node *models.Node) error
|
||||
|
||||
// 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)
|
||||
var EnterpriseResetAllPeersFailovers interface{}
|
||||
var EnterpriseResetAllPeersFailovers func(nodeid, network string) error
|
||||
|
||||
// == Join, Checkin, and Leave for Server ==
|
||||
|
||||
@@ -179,7 +179,7 @@ func ServerJoin(networkSettings *models.Network) (models.Node, error) {
|
||||
// EnterpriseCheck - Runs enterprise functions if presented
|
||||
func EnterpriseCheck() {
|
||||
for _, check := range EnterpriseCheckFuncs {
|
||||
check.(func())()
|
||||
check()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -136,7 +136,7 @@ func UpdateMetrics(client mqtt.Client, msg mqtt.Message) {
|
||||
}
|
||||
|
||||
if newMetrics.Connectivity != nil {
|
||||
err := logic.EnterpriseFailoverFunc.(func(*models.Node) error)(¤tNode)
|
||||
err := logic.EnterpriseFailoverFunc(¤tNode)
|
||||
if err != nil {
|
||||
logger.Log(0, "failed to failover for node", currentNode.Name, "on network", currentNode.Network, "-", err.Error())
|
||||
}
|
||||
|
||||
@@ -39,7 +39,6 @@ func Checkin(ctx context.Context, wg *sync.WaitGroup) {
|
||||
case <-ctx.Done():
|
||||
logger.Log(0, "checkin routine closed")
|
||||
return
|
||||
//delay should be configuraable -> use cfg.Node.NetworkSettings.DefaultCheckInInterval ??
|
||||
case <-ticker.C:
|
||||
checkin()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user