From d2fb5fc4d5799b6382222ca41450b71c902b0f2b Mon Sep 17 00:00:00 2001
From: 0xdcarns <dillon.carns@gmail.com>
Date: Wed, 12 Jan 2022 13:43:59 -0500
Subject: [PATCH] cleaned up logs

---
 logic/nodes.go  | 2 --
 logic/server.go | 3 +--
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/logic/nodes.go b/logic/nodes.go
index 0bed8b9d..75e63036 100644
--- a/logic/nodes.go
+++ b/logic/nodes.go
@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"log"
 	"sort"
 	"time"
 
@@ -398,7 +397,6 @@ func GetNodeByIDorMacAddress(uuid string, macaddress string, network string) (mo
 		logger.Log(2, "rewriting legacy node data; node now has id,", node.ID)
 		node.PullChanges = "yes"
 	}
-	log.Printf("Node is %v, Error is %v \n", node, err)
 	return node, err
 }
 
diff --git a/logic/server.go b/logic/server.go
index a7aa277e..ee038550 100644
--- a/logic/server.go
+++ b/logic/server.go
@@ -87,8 +87,6 @@ func ServerJoin(networkSettings *models.Network, serverID string) error {
 
 	node.Network = networkSettings.NetID
 
-	cleanupServerIfLegacy(node.MacAddress, network)
-
 	logger.Log(2, "adding a server instance on network", node.Network)
 	err = CreateNode(node)
 	if err != nil {
@@ -139,6 +137,7 @@ func ServerJoin(networkSettings *models.Network, serverID string) error {
 
 // ServerCheckin - runs pulls and pushes for server
 func ServerCheckin(serverID string, mac string, network string) error {
+	cleanupLegacyServers(network)
 	var serverNode = &models.Node{}
 	var currentNode, err = GetNodeByIDorMacAddress(serverID, mac, network)
 	if err != nil {