gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-02-27 01:23:00 +08:00
Code Issues Projects Releases Packages Wiki Activity

fixed log, added servernode check

Browse source
This commit is contained in:
0xdcarns 2022-01-18 09:27:24 -05:00
parent b0bb4f4f67
commit b5423e3ece
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
controllers/server_util.go
View file

@ -14,6 +14,7 @@ func runServerPeerUpdate() error {
serverctl.Push(serverData) serverctl.Push(serverData)
var settings, err = serverctl.Pop() var settings, err = serverctl.Pop()
if err != nil { if err != nil {
logger.Log(1, "error during pop,", err.Error())
return err return err
} }
return handlePeerUpdate(&settings.ServerNode) return handlePeerUpdate(&settings.ServerNode)
@ -50,15 +51,10 @@ func handleServerUpdate() error {
} }
// if peers should update, update peers on network // if peers should update, update peers on network
if settings.UpdatePeers { if settings.UpdatePeers {
var currentServerNode, err = logic.GetNodeByID(currentServerNodeID) if err = handlePeerUpdate(&settings.ServerNode); err != nil {
if err != nil {
return err return err
} }
logger.Log(1, "updated peers on network:", settings.ServerNode.Network)
if err = handlePeerUpdate(&currentServerNode); err != nil {
return err
}
logger.Log(1, "updated peers on network:", currentServerNode.Network)
} }
// if the server node had an update, run the update function // if the server node had an update, run the update function
if settings.ServerNode.ID == currentServerNodeID { if settings.ServerNode.ID == currentServerNodeID {
@ -71,8 +67,17 @@ func handleServerUpdate() error {
} }
// tells server to update it's peers // tells server to update it's peers
func handlePeerUpdate(serverNode *models.Node) error { func handlePeerUpdate(node *models.Node) error {
logger.Log(1, "updating peers on network:", serverNode.Network) logger.Log(1, "updating peers on network:", node.Network)
logic.SetNetworkServerPeers(serverNode) var currentServerNodeID, err = logic.GetNetworkServerNodeID(node.Network)
if err != nil {
return err
}
var currentServerNode, currErr = logic.GetNodeByID(currentServerNodeID)
if currErr != nil {
return currErr
}
logic.SetNetworkServerPeers(&currentServerNode)
logger.Log(1, "finished a peer update for network,", currentServerNode.Network)
return nil return nil
} }