From f54d0fd9937ab5675e19fb337a7338634303b90e Mon Sep 17 00:00:00 2001
From: Matthew R Kasun <mkasun@nusak.ca>
Date: Mon, 24 Jan 2022 13:25:56 -0500
Subject: [PATCH] fix logic in call to UpdatePeers

---
 controllers/node.go        |  4 ++--
 controllers/server_util.go | 33 ---------------------------------
 2 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100644 controllers/server_util.go

diff --git a/controllers/node.go b/controllers/node.go
index 29b28149..6379db0d 100644
--- a/controllers/node.go
+++ b/controllers/node.go
@@ -592,8 +592,8 @@ func updateNode(w http.ResponseWriter, r *http.Request) {
 		logger.Log(1, "error publishing node update"+err.Error())
 	}
 	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())
 		}
 	}
 }
diff --git a/controllers/server_util.go b/controllers/server_util.go
deleted file mode 100644
index 84cd4566..00000000
--- a/controllers/server_util.go
+++ /dev/null
@@ -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
-}