Browse Source

addressed PR comments

0xdcarns 2 years ago
parent
commit
f2606dd3cb
5 changed files with 8 additions and 9 deletions
  1. 1 1
      controllers/node.go
  2. 1 1
      logic/gateway.go
  3. 5 5
      logic/server.go
  4. 1 1
      mq/handlers.go
  5. 0 1
      netclient/functions/mqpublish.go

+ 1 - 1
controllers/node.go

@@ -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)
 		}
 	}

+ 1 - 1
logic/gateway.go

@@ -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())
 	}

+ 5 - 5
logic/server.go

@@ -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()
 	}
 }
 

+ 1 - 1
mq/handlers.go

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

+ 0 - 1
netclient/functions/mqpublish.go

@@ -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()
 		}