Merge branch 'develop' into feature-messageQueue

This commit is contained in:
Matthew R Kasun
2022-01-24 06:21:21 -05:00
42 changed files with 953 additions and 189 deletions

View File

@@ -1,20 +1,33 @@
package controller
//func runServerPeerUpdate(network string, shouldPeerUpdate bool) error {
// if servercfg.IsClientMode() != "on" {
// return nil
// }
// var currentServerNodeID, err = logic.GetNetworkServerNodeID(network)
// if err != nil {
// return err
// }
// var currentServerNode, currErr = logic.GetNodeByID(currentServerNodeID)
// if currErr != nil {
// return currErr
// }
// if err = logic.ServerUpdate(&currentServerNode, shouldPeerUpdate); err != nil {
// logger.Log(1, "server node:", currentServerNode.ID, "failed update")
// return err
// }
// return nil
//}
import (
"github.com/gravitl/netmaker/logger"
"github.com/gravitl/netmaker/logic"
"github.com/gravitl/netmaker/servercfg"
"github.com/gravitl/netmaker/serverctl"
)
func runServerPeerUpdate(network string, shouldPeerUpdate bool) error {
if servercfg.Telemetry() == "on" {
err := serverctl.TelemetryCheckpoint()
if err != nil {
logger.Log(1, "failed to send telemetry:", err.Error())
}
}
if servercfg.IsClientMode() != "on" {
return nil
}
var currentServerNodeID, err = logic.GetNetworkServerNodeID(network)
if err != nil {
return err
}
var currentServerNode, currErr = logic.GetNodeByID(currentServerNodeID)
if currErr != nil {
return currErr
}
if err = logic.ServerUpdate(&currentServerNode, shouldPeerUpdate); err != nil {
logger.Log(1, "server node:", currentServerNode.ID, "failed update")
return err
}
return nil
}