Browse Source

fix logic in call to UpdatePeers

Matthew R Kasun 3 years ago
parent
commit
f54d0fd993
2 changed files with 2 additions and 35 deletions
  1. 2 2
      controllers/node.go
  2. 0 33
      controllers/server_util.go

+ 2 - 2
controllers/node.go

@@ -592,8 +592,8 @@ func updateNode(w http.ResponseWriter, r *http.Request) {
 		logger.Log(1, "error publishing node update"+err.Error())
 		logger.Log(1, "error publishing node update"+err.Error())
 	}
 	}
 	if logic.ShouldPeersUpdate(&node, &newNode) {
 	if logic.ShouldPeersUpdate(&node, &newNode) {
-		if err := mq.UpdatePeers(&newnode) {
-		logger.Log(1, "error publishing peer update after node update"+err.Error())
+		if err := mq.UpdatePeers(&newNode); err != nil {
+			logger.Log(1, "error publishing peer update after node update"+err.Error())
 		}
 		}
 	}
 	}
 }
 }

+ 0 - 33
controllers/server_util.go

@@ -1,33 +0,0 @@
-package controller
-
-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
-}