Browse Source

cleaned up logs

0xdcarns 3 years ago
parent
commit
087f7cdb95
2 changed files with 1 additions and 4 deletions
  1. 0 2
      logic/nodes.go
  2. 1 2
      logic/server.go

+ 0 - 2
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
 }
 

+ 1 - 2
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 {